resolved merge issue