Cagada codigo final
merge