resolved conflict, new attendees