They may have had differences in the past, but it appears all that drama is now behind Drake and Chris Brown. The two were spotted together in the studio this week.

Just two years ago, Drake and Brown were involved in a fight that erupted at a New York City club. The spat was allegedly over Rihanna, Brown’s infamous ex who was rumored to have been hooking up with Drake at the time.  Rihanna’s former flame left the scene with a little bloodshed, while her supposed flame walked away unharmed.

The picture of the two musicians was first posted by producer Marcos “Kosine On Da Beat” Palacios. Music fans may recognize his name from Rihanna’s “Birthday Cake” song. The photo appeared on Kosine’s Instagram and was reportedly taken after Drake arrived at the studio Brown was already at. So far, there is no official word that the two are working together, but the “With You” singer is currently recording a new album slated to drop later this year.

This isn’t the first time in hip hop that a beef has been resolved in a musical manner. Jay Z and Nas spent a lot of the 1990’s competing. The two weren’t friendly until 2005, when Jay brought out Nas at a show and they performed a mix of their hits “Dead Presidents” and “The World is Yours.” They also reunited at Coachella this year, performing “Dead Presidents” again, but partnered that with “Where I’m From.”