Coming out of the next Arrow episode — which Stephen Amell has dubbed “Team Arrow vs. Team Felicity” — The CW series will deliver an overdue deep dive into Oliver and Felicity’s infamous Season 4 breakup.

Amell first teased the “Olicity”-centric episode last month, tweeting that he was filming the “first episode EVER where the same actor shares every single one of my scenes with me. Going to be great.” He added, “And by my scenes I mean our scenes. By definition. Super cool episode.”

Amell was referring to Season 5, Episode 20, which is titled “Underneath,” airs during May sweeps and will revisit, in depth, Felicity’s termination of their wedding engagement after learning that Oliver 1) had a son, 2) didn’t tell her, and 3) then didn’t include his bride-to-be in the decision to send young William and his mother away, to safety. Arrow Season 5 Photos

“One of the things that we’ve always wanted to do, and I think a lot of the fans have asked for, is basically deal with the consequences of Episode 415 [when] Oliver and Felicity ended their engagement and broke up,” Arrow co-showrunner Marc Guggenheim tells TVLine. “They never really had a full-on discussion or exploration of why that breakup happened. Felicity just sort of reached her breaking point and walked out the door” — that is, after the tech that remedied her gunshot-induced paralysis kicked in, allowing her to rise from her wheelchair to her feet.

“This is definitely an examination of the state of their breakup,” the EP reiterates. “It comes out of the events of 519 [titled ‘Dangerous Liaisons’ aka ‘Team Arrow vs. Team Felicity’] and, quite frankly, all the other episodes that led up to it. Something happens in 519 [airing Wednesday, April 26] that really tees up this conversation.”

Want more scoop on Arrow, or for any other show? Email InsideLine@tvline.com and your question may be answered via Matt’s Inside Line.