Update attendees_and_learners.rst
Resolved conflict