fixed hash and merge