Conflicts: executables/nr-softmodem.c executables/nr-softmodem.h targets/ARCH/rfsimulator/simulator.c