updated package.json
Fixed merge conflict