smooth over the conflict Synonym