Changes to payments
stripe changes
fixed merge conflict in gemfile and gemfile.lock