Fix indentation
Avoid CJKV text

We can’t reliably tokenize it anyway
Resolved conflicts