Merge conflict commit