updated add course template
fixed conflicts