Resolved merge issue