avance calcu duncionamiento
fixed conflict wuuuu