Diageo has resolved its dispute with the drinks industry in Britain over criticism that it was risking the reputation of single malt whiskey after it sold its Cardhu "pure malt" whisky in the same bottle and packaging it had previously used for Cardhu single malt.