corrijo merge