Resolved merge errors