Merge proposals

rfcdiff in Ubuntu has no merge proposals.