update package.json versions
merge