Making our Merge in ReservationMgrService and fixing our Test in Queries