Elon Musk, the tech billionaire and former top adviser to President Donald Trump, was approaching the president and joining him for part of the memorial service for Charlie Kirk in Glendale, Arizona on Sunday.

President Trump praised Kirk as a “great American hero” and “martyr” for freedom as he and other prominent conservatives gathered Sunday evening to honor the slain conservative political activist whose work they say they must now advance.

The service brought together a veritable who's who of the Republican Party, with numerous current and former lawmakers in the crowd. Trump, asked later on board Air Force One, was asked if Kirk had brough him and Musk back together, after a rift between the two earlier this year.

"Well Elon came over and said hello. It's nothing to do with that. It's nice, he came over, we had a little conversation. We had a very good relationship. But it was nice that he came over," Trump said.

Kirk was a provocateur who at times made statements that some called racist, misogynistic, anti-immigrant and transphobic.

That has drawn backlash from conservatives who view the criticism as cherry-picking a few select moments to insult the legacy of someone they see as an inspirational conservative leader.