diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 6b8dbbe46f5698450e3bcbabdeda224889ea03a0..2675616a77db8c972227e2cbb22446407e290d09 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -726,6 +726,11 @@ InitStatus CbmL1::Init()
             b2(i) += w * B[2] * m(i);
           }
         }
+<<<<<<< HEAD
+=======
+
+      // Solve SLE
+>>>>>>> tmp modifications
       double det;
       A.Invert(&det);
       TVectorD c0 = A * b0, c1 = A * b1, c2 = A * b2;
@@ -788,7 +793,7 @@ InitStatus CbmL1::Init()
     stsStation->SetStationID(iSt);
     stsStation->SetStationType(0); // STS 
 
-    // Set up station geometry and material
+    // Setup station geometry and material
     stsStation->SetZ(cbmSts->GetZ());
     double stsXmax = cbmSts->GetXmax();
     double stsYmax = cbmSts->GetYmax();
@@ -798,7 +803,7 @@ InitStatus CbmL1::Init()
     stsStation->SetRmax(stsXmax > stsYmax ? stsXmax : stsYmax);
     stsStation->SetMaterial(cbmSts->GetSensorD(), cbmSts->GetRadLength());
 
-    // Set up strips geometry
+    // Setup strips geometry
     //   TODO: why fscal instead of double in initialization?
     fscal stsFrontPhi = cbmSts->GetSensorRotation() + cbmSts->GetSensorStereoAngle(0) * PI / 180.;
     fscal stsBackPhi  = cbmSts->GetSensorRotation() + cbmSts->GetSensorStereoAngle(1) * PI / 180.;
@@ -806,8 +811,8 @@ InitStatus CbmL1::Init()
     fscal stsBackSigma  = stsFrontSigma;
     stsStation->SetFrontBackStripsGeometry(stsFrontPhi, stsFrontSigma, stsBackPhi, stsBackSigma);
 
-    // Set up magnetic field
-    // NOTE: Such tricky solution is needed to prevent L1Algo from FairRoot dependencies
+    // Setup magnetic field
+    // NOTE: Such solution is needed to prevent L1Algo from FairRoot dependencies
     auto getFieldValueFcn = [](const double (&inXYZ)[3], double (&outB)[3]) {
       CbmKF::Instance()->GetMagneticField()->GetFieldValue(inXYZ, outB);
     };
diff --git a/reco/L1/L1Algo/L1Parameters.h b/reco/L1/L1Algo/L1Parameters.h
index 70a91a85aaaf5fd121f583b84ccebbf345bcc08d..59a3ea5e1e34369ec16c561e2dcc7ed30350459f 100644
--- a/reco/L1/L1Algo/L1Parameters.h
+++ b/reco/L1/L1Algo/L1Parameters.h
@@ -114,7 +114,7 @@ public:
     LOG(INFO) << "    Bits to code one station:          " << kStationBits;
     LOG(INFO) << "    Bits to code one thread:           " << kThreadBits;
     LOG(INFO) << "    Bits to code one triplet:          " << kTripletBits;
-    LOG(INFO) << "    Max number of stations:            " << kMaxNstations;
+    LOG(INFO) << " #endif // L1ALGODEV   Max number of stations:            " << kMaxNstations;
     LOG(INFO) << "    Max number of threads:             " << kMaxNthreads;
     LOG(INFO) << "    Max number of triplets:            " << kMaxNtriplets;
     LOG(INFO) << "";