Merge proposals

shorewall in Ubuntu has no merge proposals.