The one conflict is AetheriaStores.CatalogTypes: keep ShipAuthoring from the ships lane and Scenario from the scenarios lane. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>