diff --git a/.gitignore b/.gitignore
index 1e5168a1..67a8d53f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,7 @@ vendor/
 coverage/
 spec/tmp
 .rspec
-<<<<<<< HEAD
 start_unicorn.sh
-=======
 /public/packs
 /public/packs-test
 /node_modules