Diageo: settlement of dispute with P. Diddy