sort so that any diffs are above no diffs