diff --git a/.gitignore b/.gitignore
index 3fce101..266f5fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,6 +159,7 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # Mac crap
+<<<<<<< HEAD
 .DS_Store
 obj
 obj
@@ -166,3 +167,6 @@ obj
 obj
 obj
 obj
+=======
+.DS_Store
+>>>>>>> 8aa36ead54fe1e3643e0e82c13af748d0672792b