diff --git a/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp b/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp
index b778f0900..321e9be19 100644
--- a/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp
+++ b/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp
@@ -142,6 +142,7 @@ void CppMetricsParser::functionMcCabe()
   });
 }
 
+<<<<<<< HEAD
 void CppMetricsParser::functionBumpyRoad()
 {
   util::OdbTransaction {_ctx.db} ([&, this]
@@ -166,6 +167,8 @@ void CppMetricsParser::functionBumpyRoad()
   });
 }
 
+=======
+>>>>>>> 61a1f5fe2912f2abe1c177573b0e7c828b5577af
 void CppMetricsParser::relationalCohesion()
 {
   util::OdbTransaction {_ctx.db} ([&, this]