Diff merge