cositas
commit del merge