add merging of diffs