Who is the president for 2025? Is it Elon Musk or Donald Trump or are they co-presidents?
This is not a problem that is going to go away. Both have strong personalities that will prevent either from stepping down or cow-towing to each other and if this problem is rearing its ugly head now, it will continue to grow as the presidency continues. The bigger problem is that each of them are strong enough with Americans, that they can each destroy the other, though on that front, perhaps Musk has an edge.
Interesting situation, no?