Fix borked merge with timetable additions stuff