resolve conflict Synonym