Diddy Settles Civil Suit