Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt
