Conflicts: cms/djangoapps/contentstore/views/checklist.py cms/templates/widgets/header.html lms/djangoapps/certificates/management/commands/regenerate_user.py lms/djangoapps/class_dashboard/views.py lms/djangoapps/courseware/tests/test_lti_integration.py lms/djangoapps/instructor/views/api.py lms/templates/courseware/course_navigation.html Conflicts Remaining in: cms/templates/widgets/header.html lms/templates/courseware/course_navigation.html
