merge some diffs