Merge proposals

apgdiff in Ubuntu has no merge proposals.