#9 course model fixed
merge conflict fixed