Update conflicts.rst

duplicate line:
    $ git add attendees_and_learners.rst