Ejemplo de conflicto
Commit Test
Merge branch 'aherrera' of https://github.com/rodo1111/git-training into aherrera