On last night's episode of "Keeping Up with the Kardashians," Bruce Jenner was faced with the unpleasant and difficult task of bringing together his wife of 23 years, Kris Jenner, and his mother, Esther Jenner.  Even the Kardashian kids got involved; Khloe Kardashian said her stepdad's mother had never been that warm.

Bruce Jenner tried to convince Kris Jenner to go visit his mother in Idaho for her 87th birthday, but Kris Jenner put her foot down and insisted she wouldn't go to visit her mother-in-law, according to RadarOnline.

"Your mom doesn't really like me that much," said Kris Jenner. "She has yelled at me- I stay away from people like that.  I made her dinner, I made her brownies, I made her pasta, my favorite soup. I put flowers in her room. I made her feel like a princess! She doesn't even like me. Why would I go visit somebody who can't stand me?" 

In a confessional booth, Kris Jenner said she had a good relationship with her first husband Robert Kardashian's parents, but never hit it off with Bruce Jenner's mom.

When Kris Jenner asked Bruce Jenner why she should go spend time with someone who can't stand her, Bruce Jenner said, "Because she's 87-years-old. She's not going to be around that much longer. Just have her see you as you are because you're a great person." 

The Jenners came to a mutual resolution: Esther Jenner would just fly out to Los Angeles to celebrate her birthday with the Jenner side of the family.

Of the Kardashian kids, Kendall and Kylie Jenner are the only two that Kris Jenner and Bruce Jenner had together.  Kris Jenner told her friend Rhonda how she felt about her mother-in-law's involvement in her daughter's lives.

"She missed 18 years of her grandchildren growing up," she said. "That's f***ed up."

Khloe Kardashian also expressed how she felt about her step-father's mother in another confessional.

"She's never really been that friendly," Khloe Kardashian said.

Luckily, when Esther Jenner arrived, she and her daughter-in-law were able to smooth over things. When the two were alone, they discussed the tension.

"We haven't been too close in any way," Esther Jenner said to her daughter-in-law.  "I'm so sorry for that."

"It was very complicated I think," Kris Jenner offered. "Just a lot of personalities in the mix and stuff going on."

"I have felt like I should stay away, stay out of the picture, and I have. But it's not right," Esther Jenner replied.

Then she said that Bruce Jenner's third marriage, to Kris Jenner, had been "the longest marriage he has had. You've been good for him and I think he's been good for you."

The two later hugged it out, and Kris Jenner seemed satisfied.

"Wow, I've waited 23 years for this. Better late than never," she said into a confessional.

Check out a video of their interaction: