It looks like Avril Lavigne and Taylor Swift put their awkward and short-lived twitter feud behind them. Continuing the tradition of introducing surprise guests onstage during her 1989 world tour, Swift decided to end the rumored "Bad Blood" between them by bringing Avril Lavigne to the San Diego stage for a rendition of her 2002 hit single, "Complicated."

Recently, the "Blank Space" singer liked a Tumblr post of Britney Spears, the two pop artists and other celebrities, comparing how they interact with their fans. Once Lavigne heard of the situation, she posted a link to the picture alongside a tweet that read "Comparison is judging and judging a person does not define who they are it defines who you are. We all Love our fans."

Lavigne continued with another tweet and picture, showcasing the "Sk8r Boi" singer looking a bit more friendly with her fans as opposed to the awkward and distance stances fans are used to encountering at meet and greets. "So let's keep it all about the love and stay positive."

The two put any animosity to rest at Swift's latest gig, in which she later tweeted, "So incredible sharing the stage with @AvrilLavigne! 'Complicated' is such a brilliant pop song and I just love her." Omi also made an appearance on the Petco Park stage to perform his acclaimed hit, "Cheerleader," Entertainment Weekly notes. The 1989 tour has seen an eclectic gathering of star-power with performances by Selena Gomez, Justin Timberlake, Alanis Morissette and Lisa Kudrow.

Lavigne later added on Instagram: "Such a Pleasure to perform "Complicated" tonight with @taylorswift on her #1989 world tour! She ROCKS".

The Miley Cyrus-hosted MTV Video Music Awards airs tonight, and Swift will attend the show and leads the pack with ten nominations. She'll also debut the music video for her latest single, "Wildest Dreams," during the MTV VMA preshow. Between "Blank Space" and "Bad Blood" the country-turned-pop singer has earned nominations in ten categories including song of summer, pop video, best female video, video of the year and more. According to ABC News, "Bad Blood" will go head to head with Beyonce's "7/11." Let's hope Kanye West remains in his seat if the award ends up in Taylor's favor.