regen diffs during merge