Revert "[Massive Refactoring] Conflicting Pairs"

This reverts commit 0bef98883f340c347bcbed0455aa407c10336a99.
Reverting to the old working solution