Yeah I remember reading at the time that they basically kissed and made up; Musk actually interacted with Tim like a human and was snapped out of his weird manic fit, and Tim told him they were still advertising. That's it.