merge some lp diffs