updated package.json
updated merge