Clarify readme for merge conflict exercise#22

fenech wants to merge 1 commit into

Migracode-Barcelona:masterMigracode-Barcelona/html-css-git-exercises:masterfrom

fenech:clarify-readme-merge-conflictfenech/html-css-git-exercises:clarify-readme-merge-conflictCopy head branch name to clipboard