Update migations to handle multi-branch overlaps