Update attendees_and_learners.rst
resolve merge conflict adding attendee