clearing up the conflicts Synonym