resolving a conflict Synonym