Edit config
conflict resolve