There’s no bad blood between Taylor Swift and Avril Lavigne. The Canadian singer joined Swift for a duet on the 1989 World Tour on Saturday in San Diego after rumors circulated that the two were feuding.

Their supposed beef started when Swift, 25, liked a Tumblr post that compared celebrity meet and greets. While people like Katy Perry and Lavigne kept distance between them and their fans, Swift was hugging and making physical contact with her supporters. When a fan pointed out that Swift liked the post, Lavigne defended herself.

She was also sure to post a collage of photos with fans where she looks much more comfortable.

If there was any misunderstanding between the two, it seems to be over now. Lavigne took to Instagram to tell her fans how much fun she had with the “Shake It Off” singer in San Diego, California. “Such a Pleasure to perform "Complicated" tonight with @taylorswift on her #1989 world tour! She ROCKS,” Lavigne captioned a photo of herself and Swift.

The singers rocked out to Lavigne’s 2002 hit “Complicated,” but not before Swift gave a very complimentary introduction. She revealed that they’d never met before Saturday, but they had been texting for a week (Lavigne’s tweets were sent out just over a week ago).

“This girl, when she came out, she was such a young teenage singer-songwriter that she inspired millions of people to want to do it,” Swift said. “And at that point, I was already starting to write songs, and I was just looking over and going, ‘That is so cool that that girl has just proven to the world that your first album can sell 16 million copies worldwide.’ That’s what this girl did with her first album. And now, she is still one of my favorite artists. And we’ve been texting all week, and we finally got to meet today and she is so cool. She is so sweet, which I love when I find out that one of my favorite artists is also super amazing as a person.”

Watch Swift’s introduction and their performance together below:

Audiences in San Diego were also treated to a performance of OMI’s hit “Cheerleader.” Lavigne and OMI are just the latest two celebrities to join the roster of guests that Swift has brought on the 1989 World Tour. Other famous faces include Justin Timberlake, Mariska Hargitay, Julia Roberts, Little Mix, Selena Gomez and many more.