~22min nondeterministic; optional determinism
resolved spurious merge