merge the remaining diffs