resolving conflict Synonym