The story between Stardust and Arrow star Stephen Amell seems to be resuming this weekend as WWE is teasing a confrontation between the two at The Heroes & Villains Fan Fest convention at the Meadownlands Exposition Center in Secaucus, New Jersey, this weekend.

The two share a history together and Amell even wrestled at SummerSlam, teaming with Neville to take on Stardust and King Barrett, a match in which Amell impressed. Amell is a big WWE fan and often expressed interest in involving himself in an angle, a dream which came true this past Summer.

The man who plays Arrow won a Slammy Award last month, however the Slammy Award was stolen by Stardust since Amell was not there to accept it in person. Two weeks ago Stardust taunted Amell on Twitter and Amell shot back saying he loves Cody Rhodes and “anytime you need the stardust beaten out of you, let me know.”

The Heroes & Villains Fan Fest Facebook posted a video hyping up Amell’s and his cast mates appearance at the convention, a video which was “hijacked” by Stardust. “Maybe I’ll show up myself,” Stardust says.