diff --git a/.gitignore b/.gitignore
index 40c2af6..8bf546a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,6 @@ venv.bak/
 
 # vscode
 .vscode/
+
+# merge orig files
+*.orig