f2 changes for conflict