LOS ANGELES, Aug 31 — Things seem to be picking back up again between Taylor Swift and Avril Lavigne.

Tay Tay welcomed pop star onstage during the San Diego stop of her 1989 tour to perform Lavigne’s hit “Complicated” seemingly putting the pair’s Twitter spat to rest.

“So incredible sharing the stage with @AvrilLavigne!” Swift tweeted shortly after the performance. “‘Complicated’ is such a brilliant pop song and I just love her.”

And just to make sure everyone knew that there were no hard feelings, Lavigne also posted a shot of the pair on Instagram captioning it, “Such a Pleasure to perform ‘Complicated’ tonight with @taylorswift on her #1989 world tour! She ROCKS.”

The two seemed to have a bit of a feud earlier this week, when Swift liked liked a post on Tumblr that compared her warm reaction with fans to the oft-awkward interaction of other artists like Lavigne.