Things are heating up in Starling City now that Oliver once again beat death – with the help of Felicity and Diggle, of…