The only reason I thought this was a two-timeline thing last episode was because of the Clifton Collins Jr. portions of the story... but then I remembered that I'd have to wrap my head around a ton of shit that wouldn't make sense if that timeline was different than the Ed Harris one. So many things.

Namely, the fact that the employees at Westworld have interacted with both timelines. Unless you believe that literally everyone is a robot, shit doesn't work. And the logo theory was disproven too. So... outside of the fact that it could've been a cool narrative trick, it just doesn't add up.