Conflicts: lms/djangoapps/instructor/views.py lms/envs/common.py lms/templates/courseware/instructor_dashboard.html
