dict: fix merge/1 and merge/2