Cissy Houston and her granddaughter, Bobbi Kristina, have come to an agreement regarding Bobbi Kristina’s estimated $20 million dollar inheritance, ending the legal battle between Bobbi Kristina and the co-executors of Whitney Houston’s estate.

Earlier this month, Pat and Cissy Houston filed a petition with the Court seeking to change the timing in which Bobbi Kristina would receive her inheritance.

According to The Hollywood Reporter, the petition stated, “[Bobbi Kristina] is a highly visible target for those who would exert undue influence over her inheritance and/or seek to benefit from respondent’s resources and celebrity.”

But TMZ is now reporting that the case has been dismissed because Grandmother and Granddaughter have reached an agreement, which sources say, is essentially the original plan that was set forth by Whitney.

All parties seem to be happy to get the matter behind them.

I’m sure they are.  Now Auntie Pat and Grandma can focus on more important things–like complaining about Bobbi Kristina’s engagement to “sorta-relative”, Nick Gordon.