Fixed the new grammar
Merge pull request #1268 from OCamlPro/fix-grammar

Fixed conflicts in the new parser grammar