bug fixed
reslove merge conflict