amended unmergeable-branch
Update attendees_and_learners.rst
Merge conflicts from upstream