diff --git a/Makefile b/Makefile
index a7fa3fc..e03d2a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
 CASK ?= cask
 EMACS ?= emacs
-<<<<<<< HEAD
-=======
 CASK_DIR ?= `${CASK} package-directory`
->>>>>>> develop
 
 all: test
 
@@ -19,11 +16,8 @@ unit:
 install:
 	${CASK} install
 
-<<<<<<< HEAD
-=======
 clean:
 	rm -Rf .emacs.d
 	rm -Rf .cask
 
->>>>>>> develop
 .PHONY:	all test unit ecukes install