merge
manual triage y espera