Updated courseConflict