Is the trailer really kidding me? Spoliers?
So do they really ruin the fact that he meets the burned girl in the end, so stupid. Looked good though to an extent.
MAJOR SPOILER WARNING
What you describe is the very last shot of the film. So, yes, if they showed that in the trailer then whoever edited the trailer is trolling the audience.