conflict in Semester resolved