Musk and Trump Are Patching Things Up