merge conflicts
changed timetable route