The Beef: 50 Cent vs. Diddy
Why They Had Beef: In 2008, Fif recorded a song called "Hip-Hop" suggesting that Diddy knew who killed Biggie. He wasn't happy that Diddy wouldn't let Mase out of his Bad Boy contract so that he could sign with G-Unit.
How They Made Up: After trading words through the media, the pair called off their beef during an appearance on MTV's "TRL." They've had other disagreements since then (50 once said that Diddy's music "sucks") but they aren't beefing with one another right now.