fixed Vincents Screw up with merging collision and gadgets