paypal mostly and some fixes
just the gemfile lock file
just the gemfile lock file
resolved merge conflict