I want to know the answer to the following question:
In which of Einstein's two theories do time and space merge into spacetime?
All the background I'm provided with is that "Time has historically been closely related with space, the two together merging into spacetime in Einstein's special relativity and general relativity.". Is that enough to answer the question?