I think Joel in the trailer was a figment of her imagination and this whole scene was her going to avenge his death, the game being just Ellie with some flashbacks of their relationship between the games.