registration: Fix merge_strategy in manifest_version 2