hash merge fix