more parser conflicts?

[Richard Eisenberg]

Hi devs,

In unrelated work, I saw this scroll across when happy'ing the parser:

> shift/reduce conflicts:  60
> reduce/reduce conflicts: 16

These numbers seem quite a bit higher than what I last remember (which is something like 48 and 1, not 60 and 16). Does anyone know why?

Thanks,
Richard