tree integration changes
conflict fix and tree functionality addition