Change to raise TypeError (Hash#merge, #merge!)
Merge pull request #2226 from yui-knk/hash-merge-error

Change to raise TypeError (Hash#merge, #merge!)