Add: Expand only direct descendants, option to start with folded root, unfold all nodes
Resolve merge conflict