merge conflict starting