Earlier this month the Houston family was in dispute over Bobbi Kristina’s inheritance after the death of her mother, Whitney Houston.

Bobbi Kristina and her grandmother Cissy Houston have dropped the case and come to an agreement.

Bobbi Kristina, 19, is set to receive an estimated $20 million from her mother’s estate, 10 percent ($2 mil) of which she would receive when she turns 21. At age 25, she is to get 20 percent ($4 mil) and the rest of the money, $16 mil, she is suppose to get when she turns 30.

Cissy thought the amount to be too much too soon. She wanted to withhold the money because she felt that if Bobbi Kristina received the money, negative influences currently in her life would threaten the inheritance.