riders now wake up and get on the elevator
fixed merge conflict