Add of conflicts and fixes in TA and Timeslot classes