diff --git a/.gitignore b/.gitignore
index 9ff0fb666..115c9b5c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,11 @@ lua-*
 .reader.kpdfview.lua
 mupdf-thirdparty.zip
 djvulibre*
+<<<<<<< HEAD
+=======
+crash.log
+.vimrc
+git-rev
 kpdfview
 slider_watcher
 *.o