diff --git a/.gitignore b/.gitignore
index 5be71c7..04d2d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,5 @@
 vim/.vim/plugged
 vim/.vim/autoload
 zsh/.zsh/cache
-<<<<<<< HEAD
 .DS_Store
-=======
 gnupg
->>>>>>> origin/main