On her current tour, Taylor Swift has been inviting some pretty big guests to join her on stage.

...and the other night was no exception. On the heels of their supposed war of words online, Avril Lavigne joined Taylor on stage in San Diego to duet on Avril's mega hit "Complicated." Guess there wasn't much to that supposed beef after all!