Conflict resolution doesn’t have to be awkward or result in a blowup. Here are a few simple tricks to de-escalate tense work situations.