Miss California Pageant directors and current title holder Carrie Prejean have mended fences in their battle over whether Prejean should retain on her crown. On Monday Pageant directors Shanna Moakler and Keith Lewis held a press conference describing the ways that Prejean had violated her contract with the pageant. It wasn’t about her views on same sex marriage, but that Prejean had become a spokesperson for an anti-gay marriage organization against pageant regulations. She also failed to disclose semi-nude photos and had not contacted pageant directors or responded to their messages.

Despite all the strikes against her, pageant owner Donald Trump announced with great fanfare yesterday that Prejean would retain her title. He focused on her statements on gay marriage and the semi-nude photos as if those were the main issues instead of the fact that she violated her contract on several counts. Trump also made a bunch of comments on how pretty Prejean is, with the cringe-worthy dismissal that “If her beauty wasn’t so great, no one would have really cared” about her remarks on same sex marriage.

Now it’s up to Moakler and Lewis to decide if they’re going to let go of their well-argued issues with Prejean and make nice or hold on to a grudge and probably get replaced. It looks like they all decided to make nice. It also sounds like we won’t be seeing Prejean in commercials extolling the virtues of opposite marriage, since they say that she’s going to “stay true to the contract”:

“Thanks to Donald Trump, we were able to have a meeting with Miss Prejean and her family alone for the first time since the pageant,” Moakler, the co-executive director of the California pageant, tells PEOPLE. “We were able to sit down and communicate and vent our frustrations. I am confident that she will stay true to the contract. I’m looking forward to returning to L.A. and starting fresh.”

After the New York meeting, which also included the other California pageant chair, Keith Lewis, The Donald, who co-owns the Miss Universe Organization, announced Tuesday that Prejean will continue to reign as Miss California USA and Miss USA runner-up despite a spate of bad publicity.

Moakler tells PEOPLE the meeting allowed them to clear the air with Prejean, who angered many when she said she was against same-sex marriage and when semi-nude photos of her surfaced after her win.

“Our issue was never about her opinions about same-sex marriage or the pictures,” says Moakler. “Our issue was with her complying with our agreement. When you sign the contract, we ask you to show us everything you are being offered. That wasn’t happening. After the pageant, we lost control of our titleholder.”

Contestants in the pageant are required to sign a 12-page document that, among several clauses, ensures that they conduct themselves “in accordance with the highest ethical and moral standards” and avoid making personal appearances, granting interviews or making commercials without authorization from pageant officials.

[From People]

I’m really glad there’s no grudge there, because as interesting as this story was it’s time for it to die now. If Moakler and Lewis continued to try and strip Prejean of her title we would be hearing about it for weeks. Now Prejean can go back to being known for being prettier than average, because that’s really what beauty pageants are about. It just gets out of hand when politics are added to the mix.

Here are photos from yesterday’s press conference, thanks to WENN.com. The Donald looks so much like an Oompa Loompa it’s eerie.