Make tokenizer recognize VC merge conflict marker | Heykuki News