A family dispute over the multi-million dollar estate of Lisa Marie Presley between her daughter, Riley Keough, and grandmother, Priscilla Presley, has come to an end. Attorneys for both parties confirmed that a settlement had been reached at a probate court in Los Angeles. Ronson Shamoun, Priscilla's lawyer, stated that the families were happy, unified, and excited for the future. Two weeks after Lisa Marie's death in January, Priscilla filed a legal challenge to her daughter's will, which left control of the wealthy Promenade Trust to Riley. Despite being reportedly angry about her grandmother's court action, Riley didn’t object to the challenge, and yesterday, it was revealed that they had resolved their differences. The specific terms of the settlement are unlikely to be disclosed to the public.