I thought Trump and Elon had a major falling out?

Actually now that I think of it, news about that fizzled out very quickly. Did they silently kiss and make up behind closed doors or something?