resolves the conflict Synonym