Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/softmodem-common.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/rrc_gNB_nsa.c