switched to authorize.net payments.
fix merge conflict in new user.