fix for conflict manager