Pour oil on troubled waters

If a person pours oil on troubled waters, they do or say something to calm a tense situation. "James is an good negotiator, and always manages to pour oil on troubled waters."