merge in vnode changes