resolved merge issues