diff --git a/include/epanet2.h b/include/epanet2.h
index e447d85..b2d730c 100755
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -274,8 +274,4 @@ extern "C" {
 }
 #endif
 
-<<<<<<< HEAD
-#endif //TOOLKIT_H
-=======
 #endif //EPANET2_H
->>>>>>> coordinates-getter