Merge proposals

diffstat in Ubuntu has no merge proposals.