Merge without Hashed States and full Policy

Missing a hashed version of the states, as well as the policy object
need to continue the merge.