GearSwap Merge Fix?