modify for conflict