resolved merge problem