Resolve 36 conflicts across source, bilingual READMEs, and generated documentation: keep master's command-identity and popup APIs, RemoteMock test infrastructure, and regenerated catalogs; keep the Auto review catalog, slot, dismissal, and snapshot content.