I just read this interesting fan theory that it might still be Felicity on that grave, and the one who was with Oliver in the limo is just some form of hallucination. Like Oliver imagining what Felicity would say to him if she were there.