i got confused with the exercise but the other code looks pretty much like that.
$ git checkout master
Switched to branch 'master'
$ git merge fencing
CONFLICT (content): Merge conflict in resume.txt
Automatic merge failed; fix conflicts and then com
mit the result.
// here you have to modify resume.txt
$ git add resume.txt
$ git commit -m ".."
[master 8f567c9] ..