New_course view
Fix merge