Not too long ago, Marilyn Manson spoke about his "falling out" with Smashing Pumpkins frontman Billy Corgan. Manson shrugged off the supposed feud as no big deal, and now we have definite proof of the duo's reconciliation. During this year's Australian Soundwave festival, Manson and Corgan shared the stage for a Smashing Pumpkins performance of "Ava Adore."

On Soundwave's closing night (March 1), both the Smashing Pumpkins and Marilyn Manson converged on Sydney's Olympic Park with bands like Slipknot, Slash featuring Myles Kennedy and the Conspirators, Exodus, Godsmack and many others for a day of good tunes. Days like these are made for surprise guest spots, as Sydney learned when Manson stepped onstage for "Ava Adore."

Corgan and Manson practically stood shoulder-by-shoulder throughout the performance, constantly making eye contact and obviously having a great time. The Sydney crowd went nuts for the surprise, which you can watch above.

As for Manson's supposed feud with Billy Corgan, the Antichrist Superstar explained its beginning during an interview with Esquire. "It was funny, because I ran into Billy [Corgan], and a lot of people think there was some kind of falling out," Manson begins. "It was mostly that he wrote a strongly worded letter about how Rose McGowan would ruin my life and ruin my career if I stayed with her, which was good advice, and he wrote it as a letter, which is very polite. There is sort of a guy code that I abide by where he totally offered his advice, and he was genuinely just looking out for my best interests. I hadn't seen him in 15 years. I had forgotten how close we were, having not seen him in so long. He's the one who taught me how to play guitar, so if it sucks or it's good, it's his fault."

Manson released his ninth studio album, The Pale Emperor, earlier this year. As for the Smashing Pumpkins, they plan to release Day for Night sometime in 2015, which will be the third full-length in their Teargarden by Kaleidoscope series.

10 Unforgettable Marilyn Manson Moments

See the Yearbook Photos of Marilyn Manson + More Rock Stars: