diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index b0dca72..b50c886 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-# import = ["~/.config/alacritty/themes/summer.toml"]
->>>>>>> ad9023961deaa970bef4341893ea13935999c6fe
 
 [window]
 padding = { x = 2, y = 0 }