diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index a20223c657d5c52e689aa4e376a6e0c5a85e08ad..6f500c117a10304be1cf1330ea45baec56674473 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3939,17 +3939,11 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         Info<< "Setting cellZones according to named surfaces:" << endl;
         forAll(namedSurfaces, i)
         {
-<<<<<<< HEAD
-            const vectorField smallVec(ROOTSMALL*(end-start));
-            start -= smallVec;
-            end += smallVec;
-=======
             label surfI = namedSurfaces[i];
 
             Info<< "Surface : " << surfaces_.names()[surfI] << nl
                 << "    faceZone : " << surfZones[surfI].faceZoneName() << nl
                 << "    cellZone : " << surfZones[surfI].cellZoneName() << endl;
->>>>>>> ENH: snappyHexMesh: various improvements. See below or the default snappyHexMeshDict.
         }
         Info<< endl;
 
@@ -4016,7 +4010,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
 
             // Extend segments a bit
             {
-                const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+                const vectorField smallVec(ROOTSMALL*(end-start));
                 start -= smallVec;
                 end += smallVec;
             }