Kanzenshuu

Yup, they are same until the point where you make difference with time travle like Trunks did with him show up and beat Frieza and Cold.
Everything until that point happend same like we saw it in db/dbz.

It will last until movie hit the theaters, movie will cover the arc after granolha and they manga will just skip that movie arc like they did with broly movie

When we talk about this there is one fun fact most of people actually don't know or ignore, they say every time you do time travle and intervene in any event you creating alternative universe (they explain a lot of it in Black Goku arc). So, that mean that Future Trunks timeline is actually main tim...

. Imagine if Zarbon, Dodoria, the Ginyu Force, King Cold, Cell, Dr. Gero, Pui Pui, Yakon, Dabura, Nappa, Raditz, and Babidi just all left Earth and the Dragon Ball universe opened up. Dragon Ball could have a dedicated "rogues gallery" and sandbox that any future creator could play with. ...

And honestly, why do people care so much about Bulma's five years line? Like, does it change anything if she said it or not? +1, i also don't get that... especially because there is lot more stuff that they say in that last few episodes of DBZ that don't make any sense anymore like when Goku say to...

I have feeling that Granolah won't be that "most powerful being in the universe", something else gonna happen in this story arc.

maybe new movie will be retcon of last few DBZ episodes about how Goku and Uub met and start training together.

He was in prison, and he did much more then 6 month of push ups, sit ups and beating his minion so now he is in Super Ultra Mega Golden Form