resolviendo conflictos
resolviendo conflictos
Revert "resolviendo conflictos"

This reverts commit 703ac141adf4da156cb858f56dedccd1d3dc8add.
Revert "resolviendo conflictos"

This reverts commit adc5f9a8b0a3e159791d57296d334375e7171602.
resolviendo conflictos 2