diff --git a/Makefile b/Makefile
index ae0c235..085de11 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ GOTAGS :=
 
 NTG_LIB_DIR ?= /usr/local/lib
 NTG_INC_DIR ?= /usr/local/include
-<<<<<<< HEAD
 
 all:
 	mkdir -p release