HOTFIX: merging bugs in trees