Fixed missing course name for course-level conflicts. Fixed selection missing bug.
Fixed missing course name for course-level conflicts. Fixed selection missing bug.

jeffh/YACS,JGrippo/YACS,JGrippo/YACS,JGrippo/YACS,jeffh/YACS,jeffh/YACS,jeffh/YACS,JGrippo/YACS