properly resolved merge