diff --git a/.gitignore b/.gitignore
index 0e53b75b4..cd6ee3e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,9 +85,3 @@ build/android/path.cfg
 build/android/and_env
 build/android/AndroidManifest.xml
 timestamp
-<<<<<<< HEAD
-
-## Backup files
-*backup.tar.gz
-=======
->>>>>>> bca616493783b18b2f280d4773cb4be41d01c434