paypal integration
Img fix
Merge conflicts