smooth over the dispute Synonym