paypal ready
fixing merge