Added no option to RSVP
song suggestion to RSVP
fix merge conflict