The one conflict is EntityInstance's SoundBank block, which this branch had moved onto item.Hardpoint and ship-mounts deleted: it stays deleted. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>