Terminado break, breakid, continue, continueid
Resuelto el merge