tree with delete
Fixing merge conflicts