Commit after merge conflict