diff --git a/.gitignore b/.gitignore
index 3c02433..e780389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,11 @@
 *.fls
 *.log
 *.out
-<<<<<<< HEAD
 *.pdf
 *.kate-swp
 *.toc
-=======
 *.synctex.gz
 
-# template.tex output
-# move to *.pdf once manual is done
-template.pdf
->>>>>>> upstream/master
-
 # release tarballs
 moderncv-*.tar.gz
 *.gz