Resolved merge