diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
index f580ba3106..39c75e0d21 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
index ff6f22bad9..4c44b92b59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
index ecbca25509..1597ab8905 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 28dfd33041..64a74514b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
index 5da159ec0c..e01c7d0bdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
index f580ba3106..39c75e0d21 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -2,11 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-<<<<<<< HEAD
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
index 6aa487df94..491f5d824c 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
index f83fee59b6..c383ea3a81 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
index ba9af11558..dbff87ae2a 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
index 4c62613408..1449474a5e 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
index a33d9a3df2..492ab236e1 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
index 4e73647493..ede2ec0462 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-=======
-|  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile