added course_setup
resolved conflicts