fixes payment and shipping dropdowns in checkout
finish merge