### Bug fixes

Fix an issue where in some situations a nested parse would break highlighting after it.

### New features

Node props may now define a `merge` function that will be used when the prop is added to a node that already has it.