Conflicts: openair1/PHY/NR_TRANSPORT/nr_transport_proto.h openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c