diff --git a/.gitignore b/.gitignore
index 1352cb25..2ff1484e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
 .DS_Store
 node_modules
-<<<<<<< HEAD
-<<<<<<< HEAD
 public/bundle.js
-=======
->>>>>>> add gitignore
-=======
->>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
 static/*
 !static/info.txt