attending to the conflict Synonym