question about Shazam in restore pre flashpoint timeline

[goldenknight2018]

DC Universe ten-issue comic book limited series written by Len Wein.
in #9 there was Jerry Ordway origin of Captain Marvel and new origin come up in Geoff Johns new 52 Shazam with new Power he no longer called Captain Marvel just Shazam, in Shazam series, he still new 52 origin.
after Doomsday clock is over and everything restores to the pre-flashpoint timeline.

and the question is. once the pre-flashpoint timeline how can Geoff fix Shazam/ Captain Marvel origin?
does that mean Jerry Ordway origin and new 52 Shazam origin in the same timeline???? this is crazy!!
unless pre flashpoint timeline and post Doomsday clock timeline are not the same timelines

[Bored at 3:00AM]

Given the magical nature of the characters, I'm sure they'll explain away all the prior versions of Billy as echoes that stretch across the history of magic, each time erasing all memory of the last time the spell was cast.

Or something like that. It's Johns. He'll figure it out.

[Vordan]

Only Johns is canon so far. They’re not bringing back old continuity with regards to Billy.