improve resolve conflict algorithm, fix guard expression parsing
caching of super states, improve LCA algorithm