refactor stack conditional
update to shipping cost
Merge branch 'develop' into staging