diff --git a/makefile b/makefile
index f97f0b7..fb75236 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,6 @@
 #
 
 expresso = ./node_modules/.bin/mocha
-<<<<<<< HEAD
 docco = ./node_modules/.bin/docco
 uglify = ./node_modules/.bin/uglify