richardli handle X merge conflict, avoid non-exist strata in the output