Conflict: modules/mesh-delivery-watchman/manifest_test.go, both sides asserting m.Consumes, and both adding a Consumes field to the test's manifest struct (kept once). Git also auto-merged module.json into two "consumes" keys (A2g's first views and A5's manifest-accepted and mesh-broker events): joined into one list, and the test asserts all five. Claude-Session: https://claude.ai/code/session_01JG73KJNrH5EgFXMKKYSrig