This week fans were stunned to see former rivals Jay Z and Kanye West greeting each other at Diddy's 50th birthday bash [click here if you missed that].
Apparently Jay and Yeezy BEEN squashed their beef....
From TMZ
Sources connected to both moguls tell us they quietly reached an agreement in the Tidal lawsuit earlier this year. We're told both men are satisfied with the outcome and they're moving forward.