config add
conflict resolve