resolved merge conflicts which have not been seen before