amended unmergeable-branch
Update attendees_and_learners.rst
resolved merge conflicts