Resolved merge issues
Delayed commit