diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 3eaa2ad7adbce8869d828f293202d0190dcd09b0..efbceb49bd95886376abfa12428901e553ca7aee 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2308,7 +2308,7 @@ int RCconfig_S1(
 
               default: {
                 LOG_E(S1AP, "Default I-DRX value in conf file is invalid (%i). Should be 32, 64, 128 or 256. \
-               Default DRX set to 32 in MME configuration\n",
+             Default DRX set to 32 in MME configuration\n",
                       pcch_defaultPagingCycle);
                 S1AP_REGISTER_ENB_REQ(msg_p).default_drx = 0;
               }
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index cef02329324b82dcddabb4558c522a9803045bb4..fdbb80e0252d9ccc0b95e71dd8fc1f8e32c67d38 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -684,8 +684,6 @@ void wakeup_prach_eNB_br(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
     }
   }
 
-  <<<<<<< HEAD
-
   // check if we have to detect PRACH first
   if (is_prach_subframe(fp,frame,subframe)>0) {
     LOG_D(PHY,"Triggering prach br processing, frame %d, subframe %d\n",frame,subframe);