Commit to remove conflicts