Fix merge conflict in package.json