Saturday Night Live and Kanye West have kissed and made up.

Shortly after last year’s VMA “Taylor Swift incident,” SNL (of course) spoofed it and it pissed Kanye off to the point where he fired shots at the entire show and the cast in they lyrics on his “Power” single: “F**k SNL and the cast / Tell ’em Yeezy said they can kiss my whole a** / More specifically they can kiss my a**hole / I’m an a**hole? You n*ggas got jokes!”

But now Yeezy and the NBC sketch comedy show are friends again, and NBC confirmed this week that the rapper will be the musical guest on an upcoming episode to be hosted by “Breaking Bad” star Bryan Cranston. West last appeared on the show nearly 2 years ago in December 2008.

According to NBC, other upcoming guests on Saturday Night Live will include Jane Lynch, former SNL cast member Amy Poehler, Katy Perry and Bruno Mars.