After having been found guilty in 2 out of 4 charges by a six-person jury, Jonatham Majors has been fired by Disney/Marvel Studios. Majors was found guilty of reckless assault in the third degree and guilty of harassment. He was found not guilty of intentional assault in the third degree and not guilty of aggravated harassment in second degree.
I think you have to view it as one timeline.
The timeline reached the 32nd century where the tech was found. Causing a basically soft reset for the timeline where going back in time technically happens after the 32nd century discovery. If the timeline could be drawn that would be where it goes cattywampus