diff --git a/.gitignore b/.gitignore
index 4a9b93d..38e66a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD
 
 ### Editor ###
 ## Vim & Emacs temp files: