merge-ort: do leave trace2 region even if checkout fails