Resolve Merge Conflicts

Resolve Merge Conflicts with CourseOffering, Registration,Util classes