Nicki Minaj opened the 2015 MTV Video Music Awards with a performance that featured a surprise appearance by Taylor Swift.

Nicki Minaj, Taylor Swift At MTV VMAs

Minaj, decked out in a flamboyant red ensemble complete with a headdress, kicked off the MTV VMAs for the second year in a row. She started off the performance with “Trini Dem Girls” before shifting into her hit “The Night Is Still Young.” When the rapper got to the chorus, Swift was spotted descending to the stage, shocking the crowd.

After wrapping up “The Night Is Still Young,” Minaj joined Swift in singing her summer smash “Bad Blood.”

The collaboration on the VMA stage between Minaj and Swift seemed to officially put to rest the drama between the two that flared up over Twitter earlier this summer.

After the MTV VMA nominations came out, Minaj suggested on Twitter that she had been snubbed in the Video of the Year category, placing the blame on the racism in the music industry. In a surprise move, Swift, who thought that a tweet about music videos featuring “slim bodies” was about her, joined the conversation.

After Minaj denied singling Swift out and further explained her feelings about the treatment of black artists, Swift publicly apologized to the rapper.

Minaj subsequently accepted Swift’s apology and the VMA performance Sunday night seems to prove that the two have put the minor row behind them.