Fixed package.json after merge