Edit CourseAssignment
Fixed CourseAssignment.cs conflicts