Revert "Problemas con el merge"

This reverts commit dae19da207b012a49d810372fedff61886978945.