In news that would have been huge in 2004: The feud between Nas and Jay-Z are friends now. The Illmatic rapper took to the Coachella stage this past weekend where he was joined by his former rival, along with – somewhat randomly – Diddy. Check out the set in the video above. I promise Diddy doesn’t ruin it like you’re expecting.

RELATED: WE THOUGHT KANYE HATED JAY-Z BUT MAYBE NOT, AS ROC NATION PARTNERS WITH DONDA