smoothing over the conflict Synonym