diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index cfafd28983..8d9ce955a0 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -9457,7 +9457,10 @@ rrc_enb_task(
       void rrc_go_nr(void);
       //if (go_nr) rrc_go_nr();
     }
+<<<<<<< HEAD
   }
+=======
+>>>>>>> 19a44bd0927547ffa58ffbcb51c840a8a770b84d
   }
 
 /*------------------------------------------------------------------------------*/