Further resolved merge issues