reorder diffs