Fixed merge conflict in package.json