diff --git a/Makefile b/Makefile
index 741d2c8..65d819d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,6 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-<<<<<<< HEAD
-=======
-PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
->>>>>>> 99554f5a8990d7e4a6abea8fe763c3ba03bdc358
 
 default_target: all