### Bug fixes

Fix a crash that could happen when reporting a conflict error.

### New features

A `@conflict` block inside `@tokens` can now be used to explicitly indicate a conflict between two tokens.

Allow rules to be explicitly inlineable with an `[inline]` pseudo-prop.