bugfix

merge code error