wrong change for conflict