resolved merge conflict error