diff --git a/src/core/system_parameters/Glonass_L1_CA.h b/src/core/system_parameters/Glonass_L1_CA.h
index 210048772..5661c2a52 100644
--- a/src/core/system_parameters/Glonass_L1_CA.h
+++ b/src/core/system_parameters/Glonass_L1_CA.h
@@ -30,17 +30,12 @@ const double NORMAL_POTENCIAL   = 62636861.4;    //!< The Normal potential at su
 
 
 // carrier and code frequencies
-<<<<<<< 4a74e308902d6500ba68e0ba830228e86b29fb3f
 const double GLONASS_L1_FREQ_HZ              = FREQ1_GLO; //!< L1 [Hz]
-=======
-const double GLONASS_L1_FREQ_HZ              = 1.602e9; //!< L1 [Hz]
->>>>>>> Add Glonass_L1_CA.h with Glonass L1 CA parameters
 const double GLONASS_L1_CA_CODE_RATE_HZ      = 0.511e6;   //!< GLONASS L1 C/A code rate [chips/s]
 const double GLONASS_L1_CA_CODE_LENGTH_CHIPS = 511.0;    //!< GLONASS L1 C/A code length [chips]
 const double GLONASS_L1_CA_CODE_PERIOD       = 0.001;     //!< GLONASS L1 C/A code period [seconds]
 const double GLONASS_L1_CA_CHIP_PERIOD       = 1.9569e-06;     //!< GLONASS L1 C/A chip period [seconds]
 
-<<<<<<< 4a74e308902d6500ba68e0ba830228e86b29fb3f
 // GLONASS SV's orbital slots PRN = (orbital_slot - 1)
 const std::map<unsigned int, int> GLONASS_PRN = 
                                                {{ 1, 1,},  //Plane 1
@@ -67,32 +62,5 @@ const std::map<unsigned int, int> GLONASS_PRN =
                                                 {22,-3,},  //Plane 3
                                                 {23, 3,},  //Plane 3
                                                 {24, 2}};  //Plane 3
-=======
-// GLONASS SV's orbital slots
-const short int GLONASS_PRN[24] = { 1,   //Plane 1
-                                    -4,  //Plane 1
-                                    5,   //Plane 1
-                                    6,   //Plane 1
-                                    1,   //Plane 1
-                                    -4,  //Plane 1
-                                    5,   //Plane 1
-                                    6,   //Plane 1
-                                    -2,  //Plane 2
-                                    -7,  //Plane 2
-                                    0,   //Plane 2
-                                    -1,  //Plane 2
-                                    -2,  //Plane 2
-                                    -7,  //Plane 2
-                                    0,   //Plane 2
-                                    -1,  //Plane 2
-                                    4,   //Plane 3
-                                    -3,  //Plane 3
-                                    3,   //Plane 3
-                                    2,   //Plane 3
-                                    4,   //Plane 3
-                                    -3,  //Plane 3
-                                    3,   //Plane 3
-                                    2};  //Plane 3
->>>>>>> Add Glonass_L1_CA.h with Glonass L1 CA parameters
 
 #endif /* GNSS_SDR_GLONASS_L1_CA_H_ */