The key is to only engage in the conflict if you know you can keep your cool.
Question and listen to both sides of the conflict intently to find the 'real' sticking point, which usually isn't  what's being argued. What information/history is each party missing from the other.
Conflict management like, like you've stated, when properly handled can bring teams together. Not always fun, but a reality of working with others.
Great article!