refactoring ast, remove unneeded contructors and NeedChange macros, refactor parser and grammar with ast
fix resolving conflicted transitions