diff --git a/.gitignore b/.gitignore
index 3251bd8..1f72f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,6 @@ npm-debug.log
 config.json
 config.test.json
 persist/
-<<<<<<< HEAD
 log/
-=======
-
 
 .AppleDouble
->>>>>>> master