The battle between Rosie O’Donnell and Donald Trump has been a vicious one, to say the least.  The two have exchanged harsh words for each other on television, in print, and on social media.  The war between the two has made its way presidential debates on more than one occasion, and Trump has not hesitated to share his dislike for the gay female comedian.

Well, the war may be coming to an end.

On Wednesday night Rosie O’Donnell tweeted a message to Ivanka Trump after the two met up with each other in Manhattan by chance. She thanked the daughter of the Republican Presidential Nominee for meeting with her, and listening to her on the Jewish New Year.

O’Donnell then told ABC News anchor Bill Ritter that the conversation between the two happened at Nobu Fifty Seven, a popular Japanese restaurant in the city that attracts many celebrities and business people.

A small recap of the history between Donald and Rosie can be seen below in a New York Post article:

The feud between the two appears to have been sparked in 2006 when O’Donnell lashed out at the mogul for not firing a Miss USA accused of using drugs, underage drinking and sexual indiscretions.

O’Donnell, then a co-host of “The View,” lashed out at Trump for not being “a self-made man” and for being a “snake oil salesman.”

“[He] left the first wife — had an affair. [He] had kids both times, but he’s the moral compass for 20-year-olds in America. Donald, sit and spin, my friend,” she said at the time.

Trump replied by calling O’Donnell “a real loser” and warned: “Rosie will rue the words she said … I’ll most likely sue her for making those false statements — and it’ll be fun. Rosie’s a loser. A real loser. I look forward to taking lots of money from my nice fat little Rosie.”

During the late September presidential debate, Hillary Clinton referred to the war of words, saying: “This is a man who has called women pigs, slobs and dogs.”

The mogul responded, “Some of it I said to somebody who has been very vicious to me, Rosie O’Donnell.”

He added, “I said very tough things to her and I think everybody would agree she deserves it and nobody feels sorry for her.”