course settings page
merge conflict resolved