@shauna I'm not great at keeping track of external sources so I don't really have links handy, but for the first point, I'd say that the most important thing is to focus on catching growing conflicts early (before they lead to resentment/grudges), and to create a culture of discussion rather than debate - where the framing is that you are collectively seeking the right answer that no one individual themselves might have yet, rather than competitively trying to figure out who is "right". The point is never to find a 'winner', always to find a solution that works for all.

I've found that those two things get you very far on the way towards a healthy conflict resolution culture. It's not an original thought, I'm sure I caught this idea elsewhere, but I do not remember where exactly.

(A related idea is that every attempt at conflict resolution should start with a non-judgmental conversation with each party to understand what *their* issue with the situation is, because different parties may have very different ideas of what the problem actually is, and very often it then turns out that their needs do not actually conflict after all and it was just a communication issue)