(BY: eda) Updating User Model for new feature for payment gateway
(BY: eda) Merge conflict after pull