Commit the fixed ones, not the conflicted ones