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