Kanye WestandJAY-Zwere back together atSean “Diddy” Combs’50th birthday party.

JAY-Z, 50, and West, 42, both attended the star-studded bash on Saturday night alongside their respective wivesBeyoncéandKim Kardashian West. Infootagefrom the party, the two rappers could be seen talking and laughing with one another, and both also posed for a photo with Diddy andPharrell Williams.

An insidertold PEOPLEthat the two rappers and their wives sat pretty close together during the festivities.

The two also collaborated on their 2011 joint album titledWatch the Throne, but their relationship became rocky after JAY-Z and Beyoncé, 38,did not attend West’s weddingto Kardashian West, 39.

Kevin Mazur/Getty Images

Kanye West and Jay-Z

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

Though Beyoncé sentwell wishes to West and Kardashian Weston their wedding day, the couple did not attend the fête in 2014. Two years later, West went on a rant during his concert, saying their daughters had yet to have a play date and neither Beyoncé nor JAY-Z checked in after Kardashian West’s Paris robbery.

JAY-Z called out West’s erratic behavior on his track “Kill JAY-Z,” and the two also battled over a money dispute involving Tidal.

“What really hurt me, you can’t bring my kid or my wife into it,” JAY-Z later said in a radio interview. “We’ve gotten past bigger issues, but you brought my family into it, now it’s a problem with me.”

The “99 Problems” rapper added: “You know it’s a problem because me and him would have been talked about it, been resolved our issues. And he knows crossed the line. He knows. And I know he knows. ‘Cause we’ve never let this much space go between one of our disagreements and we’ve had many. That’s part of who we are.”

Pharrell Williams, Kanye West, Sean “Diddy” Combs, and JAY-Z.Kevin Mazur/Getty Images

Sean Combs birthday party

In 2017, however,JAY-Z revealed the duo were back on speaking terms. “He’s my brother,” he toldT, The New York Times Style Magazine. “I love Kanye. I do. It’s a complicated relationship with us… It’s just that there’s certain things that happened that’s not really acceptable to me. And we just need to speak about it. But there’s genuine love there.”

Earlier this year, Westsued JAY-Z’s Roc-A-Fella Records, claiming he was owed money.

Kanye West and Kim Kardashian West.Kevin Mazur/Getty Images

Kanye West and Kim Kardashian

Other celebrities in attendance at Diddy’s bash on Saturday night includedNaomi Campbell,Cardi Band husbandOffset, members of the Kardashian-Jenner family, as well asUsher,Leonardo DiCaprio,Lil KimandMary J. Blige.

Asource told PEOPLEof the bash: “It was like a superstar convention! The musical giants of our time were all there to pay their respects.”

source: people.com