diff --git a/.gitignore b/.gitignore
index 8e772ac..bd82b0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,13 +25,7 @@ node_modules/
 
 # ignore local personal files
 *.geany
-<<<<<<< HEAD
 .vscode/
 .DS_Store
 theme/
 _gitignore*
-=======
-.DS_Store
-theme/
-
->>>>>>> main