develop changes for conflict