resolved merge problems