AOC and Elon Musk have settled their differences