añade mensaje de conflicto
Merge branch 'master' of https://github.com/rmarpozo/TallerGit.git
Merge branch 'master' of https://github.com/rmarpozo/TallerGit.git