Katy Perry and Taylor Swift officially bury the hatchet