Remember that story from years ago about Diddy allegedly hitting Drake at a party at Fountainbleau in Miami? The whole thing was apparently a dispute over the "0 to 100," as Diddy was reportedly sent the beat before Drake. Now, all that is water under the bridge, as Puffy hosted Drake's OVO Sound Radio on Saturday (July 22) and premiered a new song with Biggie and Rick Ross called "Watcha Gon' Do?" You can cop the song on iTunes or listen via Apple Music or Spotify below.

The song repurposes Dr. Dre and Snoop Dogg's classic single "Nuthin' But a G Thang" as Diddy spits the first verse before you hear Biggie's verse from "Hustler's Story." Ross bats third, finishing the song strong.

Diddy also took some time on the show to extoll the virtues of JAY-Z's new album 4:44, calling it the best entry in Hov's career and the best rap album of the year. Watch that footage below as well.

See Fans' Predictions for the Hip-Hop Songs That Will Rule Summer 2017

More From XXL