Adding Course Controller
Fixing Conflicts