fixed transition spelling
Fixed conflict