bug fixed release1
conflict solved