diff --git a/.gitignore b/.gitignore
index 0b3a016..7886797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,10 +245,8 @@ TSWLatexianTemp*
 # generated if using elsarticle.cls
 *.spl
 
-<<<<<<< HEAD
-#
-.ipynb_checkpoints/
-=======
 .ipynb_checkpoints/
 .vscode/
->>>>>>> develop
+
+# emacs
+*~