resolved conflicts
RSVP confirmation and notification email