diff --git a/.gitignore b/.gitignore
index 136cfa1..76489e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 node_modules
 jspm_packages
-<<<<<<< HEAD
-=======
 bower_components
 .idea
 .DS_STORE
 build/reports
->>>>>>> webpack_compatible