Resolved merge Issues