Fix the merge.
Fix in hermes.