2 version
conflict resolve