Fix the shift/reduce conflicts in the parser

fixes #7800