Merge proposals

grr in Ubuntu has no merge proposals.