clearing up the conflict Synonym