Bug/1648 move tree add tree conflict