Documented state machine.
Merge conflict solved.