diff --git a/nfapi/nrNFAPI.md b/nfapi/nrNFAPI.md
index 607673305f..299a43fd93 100644
--- a/nfapi/nrNFAPI.md
+++ b/nfapi/nrNFAPI.md
@@ -14,12 +14,12 @@ sudo ./build_oai --gNB --UE
 
 ### VNF command
 ```
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf --vnf --noS1 --phy-test
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf --nfapi 2 --noS1 --phy-test
 
 ```
 ### PNF command
 ```
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf --pnf --rfsim --phy-test --rfsimulator.serveraddr server
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf --nfapi 1 --rfsim --phy-test --rfsimulator.serveraddr server
 
 ```
 ### UE command
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 3b81cc2122..674c6f30e6 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -361,14 +361,8 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     nr_rlc_tick(frame, slot >> *scc->ssbSubcarrierSpacing);
     nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing);
   }
-<<<<<<< HEAD
-  
-  const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 2);
-  //const uint64_t dlsch_in_slot_bitmap = (1 << 2);
-=======
 
   const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 3);
->>>>>>> develop
   const uint64_t ulsch_in_slot_bitmap = (1 << 8);
 
   memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0