Change f1
conflict resolve dell