diff --git a/.gitignore b/.gitignore
index 23f505ea0..ee6906ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,6 @@ freqtrade/rpc/api_server/ui/*
 # Macos related
 .DS_Store
 
-# git files after merging
-*.orig
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]