diff --git a/test/unit/projection/proj_transform.cpp b/test/unit/projection/proj_transform.cpp
index 79484e328..4f91b4adb 100644
--- a/test/unit/projection/proj_transform.cpp
+++ b/test/unit/projection/proj_transform.cpp
@@ -207,14 +207,10 @@ SECTION("Test proj antimeridian bbox")
 
 SECTION("proj_transform of coordinate arrays with stride > 1")
 {
-<<<<<<< HEAD
+
     mapnik::projection const proj_4326("epsg:4326");
     mapnik::projection const proj_3857("epsg:3857");
     mapnik::projection const proj_2193("epsg:2193");
-=======
-    mapnik::projection const proj_4326("+init=epsg:4326");
-    mapnik::projection const proj_3857("+init=epsg:3857");
->>>>>>> master
 
     SECTION("lonlat <-> Web Mercator")
     {
@@ -249,12 +245,9 @@ SECTION("proj_transform of coordinate arrays with stride > 1")
     #ifdef MAPNIK_USE_PROJ4
     SECTION("lonlat <-> New Zealand Transverse Mercator 2000")
     {
-<<<<<<< HEAD
-        //  cs2cs -Ef %.10f epsg:4326 +to epsg:2193 <<END
-=======
+
         mapnik::projection const proj_2193("+init=epsg:2193");
-        //  cs2cs -Ef %.10f +init=epsg:4326 +to +init=epsg:2193 <<END
->>>>>>> master
+        //  cs2cs -Ef %.10f epsg:4326 +to epsg:2193 <<END
         //      170.142139 -43.595056
         //      175.566667 -39.283333
         //  END