feature/funcion3 con merge --no-ff