At last, a peace accord has been reached in the Great Swift-Minaj War of 2015.
Ordinarily treated with the kid gloves befitting America's Sweetheart, the pop star suffered a brutal backlash for interjecting herself into Minaj's passionate soapbox moment on Twitter.
The rapper had been making the point that her video was passed over for a VMA Video of the Year nomination despite its high streaming numbers and cultural impact simply because it was about celebrating a woman's curves. Videos with similar success that feature thin women, she argued, weren't passed over.
Swift, a nominee in that category for her "Bad Blood" video, apparently took this as a slight against her and interjected. Minaj quickly fought back and insisted she was not speaking about Swift.
The feud has been the biggest talking point in pop culture in the last two days, with no less than Katy Perry and Ed Sheeran getting involved. Even considering Swift's apology, there's still a lot of topics that have risen out of this that will continue to be discussed. Minaj's point has validity to it, and much has been said about what Swift's definition of feminism really means.
For now, though, the battle is over. Minaj has accepted Swift's apology. The survivors will carry on.
July 23, 2015, 12:29 p.m. This post has been updated.