Recent Commits to lark:master

better error messages for shift/reduct conflicts (#1531)

* better error messages for shift reduct conflicts

* fix format string