Resolved merge confict