Update attendees_and_learners.rst
Resolve conflicting merge of unmergeable-branch