bug fixed
conflict fix