Added the combine shipment conditions to the setup wizard

Combine shipment conditions added to the setup wizard: