diff --git a/apps/cpu/Applications.cmake b/apps/cpu/Applications.cmake
index 88ada0577231906a7093bb0c1b983099dd013eb5..e8902e5ffbb3720365476afef50a4f3fbd0ddf76 100644
--- a/apps/cpu/Applications.cmake
+++ b/apps/cpu/Applications.cmake
@@ -5,7 +5,6 @@ add_subdirectory(${APPS_ROOT_CPU}/rheometer)
 add_subdirectory(${APPS_ROOT_CPU}/CouetteFlow)
 add_subdirectory(${APPS_ROOT_CPU}/Multiphase)
 add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL)
-add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL_2)
 add_subdirectory(${APPS_ROOT_CPU}/sphere)
 add_subdirectory(${APPS_ROOT_CPU}/FlowAroundCylinder)
 add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 82f6c00630f06e00eb0084e818e9145b00560207..c8c8e6cfd3cceba85af1e9a6938b1c55a2cb02f0 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -73,7 +73,7 @@ void run(string configname)
       denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
       //denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
 
-      double startTime = 5;
+      //double startTime = 5;
       mu::Parser fct1;
       fct1.SetExpr("U");
       fct1.DefineConst("U", uLB);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
index d9379cb64de1d4e033ee6531978c64d51e056306..1daa28cbacff04dc3acc2ca1fcfa482217cd8b16 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
@@ -224,7 +224,6 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3,  SP
             f = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1, x2, x3, invDir);
             fnbr = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
 
-<<<<<<< HEAD
             // Vector3D boundaryVelocity;
             // boundaryVelocity[0] = bc->getBoundaryVelocityX1();
             // boundaryVelocity[1] = bc->getBoundaryVelocityX2();
@@ -241,24 +240,6 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3,  SP
             forceX1 += (f + fnbr) * D3Q27System::DX1[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[0];
             forceX2 += (f + fnbr) * D3Q27System::DX2[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[1];
             forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[2];
-=======
-            Vector3D boundaryVelocity;
-            boundaryVelocity[0] = bc->getBoundaryVelocityX1();
-            boundaryVelocity[1] = bc->getBoundaryVelocityX2();
-            boundaryVelocity[2] = bc->getBoundaryVelocityX3();
-            double correction[3] = { 0.0, 0.0, 0.0 };
-            if (bc->hasVelocityBoundaryFlag(fdir))
-            {
-               const double forceTerm = f - fnbr;
-               correction[0] = forceTerm * boundaryVelocity[0];
-               correction[1] = forceTerm * boundaryVelocity[1];
-               correction[2] = forceTerm * boundaryVelocity[2];
-            }
-
-            forceX1 += (f + fnbr) * D3Q27System::DX1[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[0];
-            forceX2 += (f + fnbr) * D3Q27System::DX2[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[1];
-            forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[2];
->>>>>>> 27138b35e2fb7db7637caf13179316787ebf7cc7
          }
       }
    }
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index b7ca47e567031739ede7bb7448dcb05e1ce99b45..45204279182e80bb6551a1a96ed7c550e1aa6781 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -523,11 +523,7 @@ void D3Q27TriFaceMeshInteractor::setQs(const double &timeStep)
                                         ;
                                         bcMatrix->setBC(ix1, ix2, ix3, bc);
                                     } else if (UbMath::less(bc->getQ(fdir), q) &&
-<<<<<<< HEAD
                                                UbMath::equal(-999.0, q)) // schon ein kuerzeres q voehanden?
-=======
-                                        UbMath::equal(-999.0, q)) // schon ein kuerzeres q voehanden?
->>>>>>> 27138b35e2fb7db7637caf13179316787ebf7cc7
                                     {
                                         // neu:: 18.05.2010
                                         // um falsche qs die evtl durch die "wand" gehen zu vermeiden