merge bug fix

merge fix