avance navegacion
fixing merge