diff --git a/src/core/system_parameters/Glonass_L1_CA.h b/src/core/system_parameters/Glonass_L1_CA.h
index 76d7eddc2..bd529b34e 100644
--- a/src/core/system_parameters/Glonass_L1_CA.h
+++ b/src/core/system_parameters/Glonass_L1_CA.h
@@ -2,16 +2,10 @@
 #define GNSS_SDR_GLONASS_L1_CA_H_
 
 #include <vector>
-<<<<<<< HEAD
 #include <map> // std::map
 #include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 
-=======
-#include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
->>>>>>> c381e10dc3b71a0a762b27c06ac828557d2ddf4e
-
 // Physical constants
 const double GLONASS_C_m_s       = 299792458.0;      //!< The speed of light, [m/s]
 const double GLONASS_C_m_ms      = 299792.4580;      //!< The speed of light, [m/ms]