tratando d resolver merge