Kanye West and Jay-Z have been at odds for years, and a lot of their "beef" stems from Tidal, and when Ye left the streaming service. 

It seems that beef may finally be over, as the two were spotted at Diddy's 50th birthday party, smiling and shaking hands, seemingly totally cool with each other.

Now TMZ is reporting that Ye and Jay have quietly reached an agreement in the Tidal dispute and both are happy about moving forward.

While this is great, we don't anticipate new music coming from the two, unless Jay-Z wants to collaborate on a gospel album. 

 

 

View this post on Instagram

 

 

My brothers ✊🏿

A post shared by  Diddy (@diddy) on Dec 16, 2019 at 6:41am PST

View this post on Instagram

Last night was one of those nights I’ll never forget. But something that sticks out to me is what my young creative @kaito put together with @vanityfair. All I can say is wow!! I’ve watched you grow from just a photographer to someone who captures beautiful art. Looking at these images makes me so proud. Thank you King! #DIDDY50 and thank you @natmoar

A post shared by Diddy (@diddy) on Dec 15, 2019 at 5:34pm PST

While Diddy was doing his positive thing, 50 Cent still managed to mock the reunion:

 

 

View this post on Instagram

 

 

👀man this is funny shit , 😆#lecheminduroi #bransoncognac #starzgettheapp

A post shared by  50 Cent (@50cent) on Dec 16, 2019 at 1:32pm PST