S6, E23: Oliver and Diaz head into battle, as a new ally joins Oliver's team. The final confrontation becomes explosive, as the battle heats up.