Dummy out the spin bug and add a nonadmin merge scenario