Dixed merge conflict