Conflicts: lms/djangoapps/commerce/urls.py lms/templates/courseware/progress.html openedx/core/djangoapps/credit/tests/test_api.py
