ELON V. TRUMP, IS THE FEUD OVER?