[[feature-stackdir]] Remove conflict-related infrastructure.

We'll handle this at a higher level.