some EBNF parse added
solved conflicts