diff --git a/.gitignore b/.gitignore
index 57ff146..66498dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
 .DS_Store
 .dropbox
 <<<<<<< HEAD
+<<<<<<< HEAD
 Icon
 =======
 Icon
 >>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
+=======
+Icon
+>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389