Revert "ARREGLO DEL CONFLICTO"

This reverts commit 0b3f0e8b5bcff4db9e33ef8e0087290bc92796bc.