udpate the whippet js
merge resolve