diff --git a/makefile b/makefile
index a972dcbb5edc2b3a4c1cb760327c4bfba8b46b82..5bd2706408718620a446a99d0af5daac89d25227 100644
--- a/makefile
+++ b/makefile
@@ -21,13 +21,11 @@
 # ** end header
 #
 
-<<<<<<< HEAD
+SHELL:=/bin/bash
+
 runserver:
 	mvn exec:exec
 
-=======
-SHELL:=/bin/bash
->>>>>>> 619a505b48586e03fd34f65da12d6ff1b32138c6
 run: compile
 	mvn exec:exec