making another unmergeable branch
Update attendees_and_learners.rst
fixed another conflict