Taylor Swift and Katy Perry might have just made up