some collision
fix includes in lexer and parser