diff --git a/.gitignore b/.gitignore
index 27e7582..4b327e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Logs
 logs
 *.log
@@ -103,6 +102,6 @@ dist
 
 # TernJS port file
 .tern-port
-=======
+
+# BOL Data
 /data/
->>>>>>> bac28e8... initial import