changes to nrf code for xc8
resolved conflicts