Oliver Queen (Stephen Amell) got engaged in "Arrow" Season 3, episode 21. The CW

For “Olicity” shippers, episode 21 of “Arrow” Season 3 was a nightmare. Fans have been hoping to see Oliver Queen (Stephen Amell) and Felicity Smoak (Emily Bett Rickards) get together for a long time. Though the pair recently hooked up, giving viewers hope of a longer-term romance, a surprise twist in episode 21 made that pretty doubtful.

Throughout the episode, Oliver, who shockingly accepted Ra’s Al Ghul’s proposal (Matt Nable) to become Al Sah-Him, Wareeth al Ghul – Ra’s’ successor as the head of the League of Assassins – was following orders from his new boss to hunt down Nyssa al Ghul (Katrina Law). The brainwashed Oliver succeeded in capturing Nyssa, the only real threat to his new positon, and brought her back to Ra’s at Nanda Parbat. However, instead of killing her, Ra’s decided to go in another direction. In order to preserve peace within the league of assassins, Ra’s hatched a plan for Oliver and Nyssa to marry instead!

Not surprisingly, Felicity does not seem too pleased about the big engagement in the next episode. In fact, she may not even believe it. The promo for episode 22 shows Felicity accusing Malcolm Merlyn (John Barrowman) of lying when he comes to them with news about Oliver. Plus, the promo reveals that a brainwashed Oliver is on his way to Starling City on a mission to, as Ra’s puts it, “bring death to Starling City.”

Watch the promo for episode 22, “This is Your Sword,” below:

How Will Felicity handle the news of Oliver’s surprise engagement? And will team Arrow be able to stop Oliver from attacking the city he had spent so much time trying to protect? Fans will have to wait to find out. “Arrow” airs Wednesdays at 8 p.m. EDT on the CW.