smoothing the conflict Synonym