Resolving package.json conflict