resolving package.json conflict