refactor upcoming reservations
fixed merge conflict
changed query of upcoming reservations
fixed merge conflict