Former rivals Chris Brown and Drake have left their beef far in the past, and the two new pals are teaming up for a new collaboration on Brown's upcoming album, Indigo.

"No Guidance" is one of the 37 tracks on the record, which will also include features from H.E.R., Justin Bieber, Lil Jon, Lil Wayne and the Nicki Minaj and G-Eazy collab, "Wobble."

Breezy teased the pairing with Drake, who he recently dubbed Aubreezy, by posting a photo of the duo on Instagram with the caption, “SUMMER TIME BOUT TO GET ALOT HOTTER!”

 

They began feuding back in 2012 over Rihanna, and in June of that year, the two and their friends began throwing bottles at each other at NYC's W.i.P. nightclub over a note that allegedly read "I'm f---ing the love of your life." The duo squashed their beef and performed on stage together during Drake’s “Aubrey and the Three Migos Tour” last year at the Staples Center in Los Angeles. Since then, they've been spotted out together.

Brown's Indigo is out June 28.