only merge shipping options if we are delivering
fix indenting