Merge proposals

flup in Ubuntu has no merge proposals.