added course pages
fixed conflicts