Resolved merge error