diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
index 67756557b3..3d7edb19ec 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
@@ -14,10 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-<<<<<<< HEAD:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
-simulationType RASModel;
-=======
 simulationType      RASModel;
->>>>>>> c2eac7aaca53e9702c56bbbbd2c0dc47a83829e0:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
 
 // ************************************************************************* //