Revise leasehold estates and defeasible estates
Fix merge conflict in possessory estates