merge bug fix