Taylor Swift and Nicki Minaj set the music industry on fire yesterday after Swift took offense to one of Nicki’s tweets.

Minaj suggested her “Anaconda” music video had been snubbed by the VMAs; who, she claims, only recognize women with “slim bodies” in their Video of the Year nominations. Considering everyone else nominated was either male or Beyonce, it’s clear the comment was aimed at Taylor, who quickly shot back:

However, it appears that all of this has been cleared up, as the “Bad Blood” singer issued a direct apology to Nicki Minaj through Twitter:

At least there was a happy ending to this Twitter Beef saga. As the Drake and Meek Mill controversy still continues to unfold.