clearing up conflicts Synonym