fix rsvp.
fix merge conflict and use better approach.