Resolved merge problem