changed for conflict