smoothing over a dispute Synonym