diff --git a/openair1/PHY/NR_REFSIG/nr_gold.c b/openair1/PHY/NR_REFSIG/nr_gold.c
index c71836bfa0..9fd03b52c1 100644
--- a/openair1/PHY/NR_REFSIG/nr_gold.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold.c
@@ -154,17 +154,14 @@ void nr_init_csi_rs(PHY_VARS_gNB* gNB, uint32_t Nid)
 
 }
 
-<<<<<<< HEAD
 void nr_init_prs(PHY_VARS_gNB* gNB, uint32_t symNum)
 {
   unsigned int x1, x2;
   uint16_t Nid, i_ssb, i_ssb2;
-=======
 void nr_init_prs(PHY_VARS_gNB* gNB)
 {
   unsigned int x1, x2;
   uint16_t Nid;
->>>>>>> 3e6ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
   //unsigned char Lmax, l, n_hf, N_hf;
   nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
@@ -173,7 +170,6 @@ void nr_init_prs(PHY_VARS_gNB* gNB)
 
   Nid = cfg->cell_config.phy_cell_id.value;
 
-<<<<<<< HEAD
   //Lmax = fp->Lmax;
   //N_hf = (Lmax == 4)? 2:1;
 
@@ -182,27 +178,22 @@ void nr_init_prs(PHY_VARS_gNB* gNB)
       i_ssb = sumNum & (symbols_per_slot-1);
       i_ssb2 = i_ssb + (slot<<2);
 
-=======
   for (slotNum = 0; slotNum < fp->slots_per_frame; slotNum++) {
     for (symNum = 0; symNum < fp->symbols_per_slot ; symNum++) {
->>>>>>> 3e6ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
       reset = 1;
       // initial x2 for prs as 38.211
       uint32_t c_init1, c_init2, c_init3;
       uint32_t pow22=1<<22;
       uint32_t pow10=1<<10;
       c_init1 = pow22*ceil(Nid/1024);
-<<<<<<< HEAD
       c_init2 = pow10*(slotnum+symNum+1)*(2*(Nid%1024)+1);
       c_init3 = Nid%1024;
       x2 = c_init1 + c_init2 + c_init3;
 
 
-=======
       c_init2 = pow10*(slotNum+symNum+1)*(2*(Nid%1024)+1);
       c_init3 = Nid%1024;
       x2 = c_init1 + c_init2 + c_init3;
->>>>>>> 3e6ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
       for (uint8_t n=0; n<NR_MAX_PRS_INIT_LENGTH_DWORD; n++) {
         gNB->nr_gold_prs[slotNum][symNum][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;