changes for conflict