more text for timeslots
resolved merge conflicts