Hopefully resolved merge issues with -mcr section update