Last week, all hell broke loose in the Twitter-sphere after Wiz Khalifa raised Kanye West's blood pressure by critiquing the renaming of his new album, Waves and accidentally got Kim Kardashian (and ultimately, Amber Rose, involved) after Ye misinterpreted a "kk" tweet to be about his wife and not Wiz's strand of weed. 

Digital punches were thrown and half-hearted apologies were written, but now it looks like the beef has officially been squashed. Or so says Yeezy. "Me and Wiz spoke yesterday." He tweeted. "Great Convo. All positive."

Me and Wiz spoke yesterday. Great convo. All positive.

— KANYE WEST (@kanyewest) February 2, 2016

 Meanwhile, Kim K and Amber Rose (who happens to be both Kanye and Wiz's ex) apparently reconciled enough to post a picture of themselves together on Twitter.

Tea anyone? pic.twitter.com/HbkIJa998c

— Kim Kardashian West (@KimKardashian) February 2, 2016