fixed turnos
merge