How do you handle team conflicts?

In our implementation of a new (lean) way of working we are uncovering a number of conflicts within our teams. We’re pushing for more and more collaboration and task switching, which reveals differences in opinion and preferences, and as we’re putting more of the decision power on the teams the stakes get higher.

Personally I think the process of negotiation and conflict resolution is very valuable (albeit very tiring most of the times) and something I would like my teams to become much better at. I’m just not 100% sure on the best way to accomplish that.

How do you handle team conflicts? I’d love to hear your thoughts.