Solución completa
Merge remote-tracking branch 'origin/esteban-lopez'