This is exactly what I would do.

Without agent collaboration, you'll need a whole tree of agents just to resolve the merge conflicts.

usually the orchestrator or planner that spawns the sub-agents is the -collaboration- protocol as it has visibility to all others and can start/kill new ones at wish as it sees fit and coordinate appropiately but yea