hash merge bug fix