cambios estructural
merge and struck changes