FEUD OVER! Katy Perry is in Taylor's New Music Video!