Conflict finding

gistfile1.txt

daniele@Danieles-MacBook:~/afraid-to-commit$ git remote add juan https://github.com/reidrac/afraid-to-commit
daniele@Danieles-MacBook:~/afraid-to-commit$ git merge juan/add-my-name 
daniele@Danieles-MacBook:~/afraid-to-commit$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#  modified:   attendees_and_learners.rst
#
no changes added to commit (use "git add" and/or "git commit -a")
daniele@Danieles-MacBook:~/afraid-to-commit$ git checkout attendees_and_learners.rst
daniele@Danieles-MacBook:~/afraid-to-commit$ git checkout -b testbranch
Switched to a new branch 'testbranch'
daniele@Danieles-MacBook:~/afraid-to-commit$ git merge juan/add-my-name 
Auto-merging attendees_and_learners.rst
CONFLICT (content): Merge conflict in attendees_and_learners.rst
Automatic merge failed; fix conflicts and then commit the result.
daniele@Danieles-MacBook:~/afraid-to-commit$