Is The Katy Perry x Taylor Swift Feud Officially Over?