Merging AffinityId current version