diff --git a/.gitignore b/.gitignore
index 3dae654..afe3b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-<<<<<<< HEAD
+
 *.DS_Store
-=======
+
 # General
 .DS_Store
 .AppleDouble
@@ -90,7 +90,7 @@ local.properties
 # Typically, this file would be tracked if it contains build/dependency configurations:
 #.project
 
->>>>>>> 28280ec94efca9a2a06808ca8279c3bace4835de
+
 *.metadata/
 *.class
 /GameProject/doc/