Updated course_type
Typo
fixed merge conflict