resolving more conflicts plus...
resolving more conflicts plus...

there were some whitespace errors that needed to be resolved.
also - the validation of expiration date would throw 500 server error when passed bad data. fixed above so that if mm/YYYY can't convert to datetime object then ValueError is caught and handled, resulting in is_valid returning False.
devops-s17-payments/payments,devops-s17-payments/payments,devops-s17-payments/payments