Fixed bug that you couldn't save to file or display, together with --show-tokens
Resolved conflict