Update conflicts.rst
Update conflicts.rst

duplicate line:
    $ git add attendees_and_learners.rst
marbont/afraid-to-commit,jdimiceli/afraid-to-commit,Spanarchie/afraid-to-commit,josephfrancis/afraid-to-commit,bm3/afraid-to-commit,AdamAdamAdamAdam/afraid-to-commit