2: changes for conflict