Fixed conflicts in the new parser grammar