Elon Musk and AOC are finally on the mend