smoothing out the conflict Synonym