new icon for tree
update url after rename
fix merge conflict