Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
	openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
	openair1/PHY/defs_NR.h