Revert change to merge_states