Fixed package.json merge error