tells yacc that we expect some reduce/shift conflicts to happen
Merge pull request #892 from jeffali/fix/aix_conflict

tells yacc that we expect some reduce/shift conflicts to happen