integration of timetable
merge conflicts