bug fixed
conflict resolve