It was not until dark he found he thought was the correct way to solve the problem.
A．that；whatB．that

It was not until darkhe foundhe thought was the correct way to solve the problem.
A．that；whatB．that；thatC．when；whatD．when；that