resolve without conflict Synonym