diff --git a/src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C b/src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C
index 63d40b02..bc666c96 100644
--- a/src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C
+++ b/src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C
@@ -88,7 +88,7 @@ tmp<volScalarField> noThermCond::thermDiff() const
         (
             IOobject
             (
-                "fake1",
+                "fake2",
                 particleCloud_.mesh().time().timeName(),
                 particleCloud_.mesh(),
                 IOobject::NO_READ,
diff --git a/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff b/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff
index c014ecff..e6baf497 100755
--- a/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff
+++ b/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff
@@ -1,13 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-<<<<<<< HEAD
 |  \\    /   O peration     | Version:  1.6                                   |
 |   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-=======
-|  \\    /   O peration     | Version:  2.3.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -15,54 +10,34 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-<<<<<<< HEAD
     object      thDiff;
-=======
     location    "0";
     object      T;
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 2 -1 0 0 0 0];
 
-<<<<<<< HEAD
 internalField   uniform 0.0;
-=======
-internalField   uniform 0;
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
 
 boundaryField
 {
     top
     {
         type            fixedValue;
-<<<<<<< HEAD
-        value           uniform 6e-05;
-=======
         value           uniform 2.3e-5;
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
     }
 
     bottom
     {
         type            fixedValue;
-<<<<<<< HEAD
-        value           uniform 6e-05;
-=======
         value           uniform 2.3e-5;
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
     }
 
     walls
     {
         type            fixedValue;
-<<<<<<< HEAD
-        value           uniform 6e-05;
-=======
         value           uniform 2.3e-5;
-    
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
     }
 
     symmetry
@@ -76,11 +51,5 @@ boundaryField
     }
 }
 
-<<<<<<< HEAD
 // ************************************************************************* //
 
-
-=======
-
-// ************************************************************************* //
->>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
diff --git a/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/constant/couplingProperties b/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/constant/couplingProperties
index ea2b4385..98694a8d 100644
--- a/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/constant/couplingProperties
@@ -78,7 +78,7 @@ energyModels
 	//reactionHeat	
 );
 
-thermCondModel SyamlalThermCond;//thermCondModel;//off;
+thermCondModel off;//SyamlalThermCond;//thermCondModel;//off;
 
 chemistryModel	species;