Fixed merge issue in package.json