grammar: add unresolved conflict information to state description

Signed-off-by: Peter Williams <pwil3058@gmail.com>