What the hell, there's no bad blood here!
After a star-studded five-night run in Los Angeles, Taylor Swift kept the 1989 World Tour surprises coming in California by bringing Avril Lavigne on stage Saturday night at Petco Park in San Diego, just days after a Tumblr post caused a skirmish between the two.
WATCH: Taylor Swift Lost in When She Met Justin Timberlake in 2008
The pop-punk princess performed her first-ever hit from 2002, "Complicated," with Taylor.
"So incredible sharing the stage with @AvrilLavigne!" the 25-year-old singer said. "'Complicated' is such a brilliant pop song and I just love her."
WATCH: Avril Lavigne Breaks Down in Tears Over Battle With Lyme Disease
The Canadian crooner felt the same way, calling Taylor "a doll" in a first Instagram post and thanking her in a second. "Such a Pleasure to perform 'Complicated' tonight with @taylorswift on her #1989 world tour! She ROCKS," she wrote.
All is clearly better in #GirlSquad world! Earlier in the week, Taylor liked a fan-created Tumblr post that showed her hugging excited fans while other pop stars, including Avril, looked awkward around theirs. Avril didn’t seem thrilled about this, tweeting, "Comparison is judging and judging a person does not define who they are it defines who you are. We all Love our fans… So let’s keep it all about the love and stay positive."
MORE: All of Taylor Swift's L.A. Tour Guests Ranked by Randomness
Looks like this is how Taylor did just that! And Avril even wore a sequined mini for the occasion, which is so not Hot Topic of the "Sk8r Boi" girl.
Avril, 30, has been battling Lyme disease, and this was only the second concert appearance she's made on stage recently. The first show she played in over a year was in July, when she performed "Fly" at the Special Olympics World Games Opening Ceremony in L.A.
Taylor's had some major names perform with her through the 1989 World Tour! Watch pals Justin Timberlake and Selena Gomez surprise her L.A. fans in the video below.