Clicking on the tree does something
Fixed merge issues
Fixed merge issues