For the most part Musk (and his businesses) and the administration, as well as US auto manufacturers, are playing nice now and realize they need to work together. The sniping between them has decreased a lot and is mostly coming from elsewhere while their collaboration has increased. Mostly because the economics of EVs have shown resistance is futile and SpaceX' capabilities are so useful.