On July 21, rapper Nicki Minaj tweeted about how “slim” people tend to get VMA nominations. Swift thought the diss was directed at her and fired back at Minaj, saying she was surprised Minaj would “pit women against each other.” The two quickly realised it was a miscommunication, and Swift publicly apologised to Minaj shortly after.

To show they’re on good terms, the singers joked about their fight on stage at the VMAs. On Sunday, Swift joined Minaj for the end of her performance and the two sang the hook from Swift’s hit song, “Bad Blood.”

Swift reportedly wrote “Bad Blood” about her friendship with singer Katy Perry turning sour (Swift got angry at Perry for allegedly stealing some of her backup dancers).

Perry actually commented on the Minaj-Swift Twitter fight back in July too. Perry said she found it ironic that Swift, who has made a lot of money bashing her in “Bad Blood,” would protest about pitting women against each other.