merge conflict commit