resolved merge results