diff --git a/.gitignore b/.gitignore
index 82b9526..587bd0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 # Godot 4+ specific ignores
 .godot/
 /android/
-=======
 # ---> Godot
 # Godot 4+ specific ignores
 .godot/
@@ -20,4 +18,3 @@ export_presets.cfg
 data_*/
 mono_crash.*.json
 
->>>>>>> 888d736ce7ea2debeed0ad9b786ae60a4fb59638