diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
index c8f122258..36e5d78cd 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
@@ -188,21 +188,6 @@ void pcps_acquisition_cc::set_local_code(std::complex<float> * code)
     volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
 }
 
-bool pcps_acquisition_cc::is_fdma()
-{
-    // Dealing with FDMA system
-    if( strcmp(d_gnss_synchro->Signal,"1G") == 0 )
-        {
-            d_freq += DFRQ1_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN);
-            LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << DFRQ1_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN) << " in Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl;
-            return true;
-        }
-    else
-        {
-            return false;
-        }
-}
-
 
 bool pcps_acquisition_cc::is_fdma()
 {
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 26126e55f..4529a1fba 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -745,15 +745,7 @@ void GNSSFlowgraph::set_signals_list()
                     available_gnss_prn_iter++)
                 {
                     available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"),
-<<<<<<< 3c93101c23e7e730777f47eeff6e7d538c9528e4
-<<<<<<< aadcdb80509f7a96b0558b8d33ecaed526bceae9
                             *available_gnss_prn_iter), std::string("1G")));
-=======
-                            *available_gnss_prn_iter), std::string("5X")));
->>>>>>> Add glonass svn in signals list
-=======
-                            *available_gnss_prn_iter), std::string("1G")));
->>>>>>> fix glonass signal string
                 }
         }
     /*
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index a346cf12f..a739204f9 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -615,4 +615,3 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities)
 
     delete acquisition;
 }
-