Resolve ambiguous step def