fixed merging problem in package.json