smooth over conflicts Synonym