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