Revert "tratando de hacer merge"

This reverts commit f4e9ee20d39442c52133c8e18abfbe304594aec5, reversing
changes made to 7fb3343e72136e2a2d81fad75ccc1a68fdbd926a.
basura el merge

This reverts commit 8394e69357bf5b2395629ff1661e1471bb89f4ee.