Fixed bugs in turnos
merges