resolve committed merge conflict