package.json conflict fixed