new commodity method for conflict manager
Clean broken tests
avoid code duplication
initla work