change some more merge to merge! on new hashes