Fix : Billing and Shipping address correction

Fix : Switched the incorrect billing and shipping address