I really don't know what to make of this mess except to say that Kubo has painted himself into a pretty pickle either way. Either OMZ was TZ in which case he would already have fused with Ichigo's hollow/shinigami powers before FGT rendering the end of the last chapter moot, or OMZ was not TZ in which case there was no reason for TZ to merge with the inner hollow before FGT because they were already merged since before Ichigo was borne as per Oetsu. Face it guys, it's a sloppy retcon either way, requiring too much conjecture outside of what has been written to make it jive. I still love it though... Just wish Kubo would clean it up, hopefully he does.