diff --git a/.gitignore b/.gitignore
index 3c617e0..a20656a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -227,3 +227,7 @@ tests/data/
 #Cmake stuff
 buildprod*/
 *_export.h
+
+
+# git merge
+*.orig