In which of Einstein's two theories do time and space merge into spacetime