successfully integrated the college/course dropdown
for merging conflicts
fixed merge conflicts