Conflicts were resolved on :
   # Trivial:
   openair2/LAYER2/MAC/eNB_scheduler_RA.c
   openair2/LAYER2/PDCP_v10.1.0/pdcp.c
   # issue416_nfapicleanup version was taken
   openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
   # not so trivial --> to be checked
   targets/RT/USER/lte-softmodem.c
   targets/RT/USER/lte-uesoftmodem.c