diff --git a/.gitignore b/.gitignore
index 4687843..5c54467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-.*~
-abra/catalogue
-abra/recipes
-abra/logs
-=======
 *~
 abra/catalogue
 abra/recipes
 abra/logs
->>>>>>> origin/main