merge checkout_billing_fields and checkout_shipping_fields in checkout_fields method