Attendees now updatable in bulk
Fixed merge conflict