Conflicts: lms/djangoapps/django_comment_client/tests.py lms/lib/comment_client/utils.py lms/templates/courseware/courseware.html
