fixing rsvp model
merging conflicts