Fix forgotten merge conflict in package.json