CLC-2609 (QA) Tele-BEARS semester rollover (fixed merge conflicts)

Fixed the merge conflicts that were present in #1624 

https://jira.media.berkeley.edu/jira/browse/CLC-2609