Fixed payment flow
Fixed merge conflicts