update package.json
minor merge fix