merge conflict resolve

extended desc.