Fix merging multiple options hashes, add test.