diff --git a/.gitignore b/.gitignore
index 925125c..4eba4c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,8 +159,12 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # Mac crap
+<<<<<<< HEAD
 .DS_Store
 bin
 obj
 bin
 obj
+=======
+.DS_Store
+>>>>>>> 2891b240fbaeda9cf85f05d4ea0ce3b26599a50c