Timeslot voting
Fix Merge Conflicts