Courses works with DB
fixed conflicts