fix conflict in course