Typically people use sub agents from what I've seen to work in different parts of large code bases at a time.
If your hitting merge conflicts that bad all the time you should probably just have a single agent doing the work. Especially if they're intertwined rightly