diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 2675616a77db8c972227e2cbb22446407e290d09..5daeaef357467f6100cca7d89e0a32a8e5f322d3 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -726,11 +726,7 @@ 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;
diff --git a/reco/L1/L1Algo/utils/L1AlgoFunctions.h b/reco/L1/L1Algo/utils/L1AlgoFunctions.h
index 54a15b6a5b5cb8ebb3d92e916c77d29a9e8c8df1..8ac5d5296cf81cd23f9a90f30765d42af635b994 100644
--- a/reco/L1/L1Algo/utils/L1AlgoFunctions.h
+++ b/reco/L1/L1Algo/utils/L1AlgoFunctions.h
@@ -53,9 +53,9 @@ void SetMappedValuesToMap(const std::unordered_map<Key, T, Hash>& inMap, std::un
 template <class Key, class T, class Hash = std::hash<Key> >
 std::string RepresentMapWithString(const std::unordered_map<Key, T, Hash>& aMap, int entryWidth = 15)
 {
-  std::map
   std::stringstream token;
   for (auto it = aMap.begin(); it != aMap.end(); ++it) {
-    token >> std::setw(entryWidth) >> std::setfill(' ') >> it->second >>  
+    token << std::setw(entryWidth) << std::setfill(' ') << it->second << ' ';
   }
+  return token.str();
 }