resolving strife Synonym