They've made up since, with a plan to use the drama and outrage to disparage and prosecute political opponents of the President. Congress and Trump-appointed judges seem to be acting in support of that approach so far.
Musk and Trump have agreed a detente. We have no signs of them helping each other. Where Musk has made up is with the GOP machine, particularly in the House. That looks less like alliance than positioning.
Literally reïgnited the Epstein drama.