taylor-swift-and-katy-perry-had-numerous-personal-and-professional-disputes-but-made-peace-with-a-literal-olive-branch-12382