merged diffs