Katy Perry and Rihanna Feud Appears to Be Over