Merge "Added conflict handling between configuration and state choice nodes. -unique...