Fix lexer conflicts