While the saga continues for Drake and Kendrick Lamar, it seems another feud is coming to a close.

Chris Brown and Drake, who have allegedly brawled at a New York nightclub and talked smack to each other afterwards, have let calmer minds prevail. In a recent post on Brown’s Facebook page, he states “hangin with Drake in the studio.”

Huh? Here’s a reminder: Drizzy and Brown were said to be romantically involved with Rihanna. The pair reportedly fought over her last December, which resulted in a bar brawl and thrown champagne bottles. RiRi never officially responded to the back and forth, but it was a huge moment in her tumultuous relationship with Breezy.

It’s unclear whether the footage was taken before or after their altercation. But it looks like Drizzy has joined in on the sessions for Brown’s upcoming album X.

[via Billboard]