Updated package.json
package.json merge fix