Merge proposals

offlineimap in Ubuntu has no merge proposals.