The former industry rivals are now teaming up and putting their beef far behind. Now, singer Chris Brown and rapper Drake will collaborate for Brown’s upcoming studio album, Indigo.

Billboard reports that the track they’re working on is entitled ‘No Guidance’. It is one of the 37 tracks expected from the record which will also include featured tracks with H.E.R., Lil Jon, Lil Wayne, and Justin Bieber. Brown’s collab with Nicki Minaj and G-Eazy, ‘Wobble Up’ will also be featured in the record. ‘Wobble Up’ was released on April 18.

Breezy teased the Drake collab in a photo of them together that he posted on Instagram. The singer captioned the shot “SUMMER TIME BOUT TO GET ALOT HOTTER!”

https://www.instagram.com/p/ByU2c3YBVK8/?utm_source=ig_embed

The two artists didn’t always get along as well as they do now. A feud between the pair ignited after rumors linked Drake with Brown’s ex, Rihanna. Brown and Rihanna’s relationship was notorious for the domestic abuse Rihanna suffered from the singer.

Read More: Chris Brown a no-show in meeting with rape accuser

The feud reportedly escalated into a full-blown brawl when the two threw bottles at each other at NYC’s W.i.P. nightclub. The brawl started over a note that allegedly read “I’m f—ing the love of your life”.

Last year, the duo squashed their beef when they performed together during “Aubrey and the Three Migos Tour” held at the Los Angeles Staples Center. Since their performance, the artists have been seen hanging out together.

Brown is set to drop his 9th studio album, Indigo this June 28.