Commit modificado
Commit antes del conflicto
Merge branch 'master' of https://github.com/miguelcg/test-repo