conf change
conflict resolve