fix bugs merge

fix bugs merge