From b6d7d78e9de6ef137696389b6000f172856e94e6 Mon Sep 17 00:00:00 2001
From: Keyrxng <106303466+Keyrxng@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:41:51 +0100
Subject: [PATCH] chore: fix conflicts

---
 package.json  | 1 +
 tsconfig.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 57f8662b..67095103 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "axios": "^1.6.7",
     "dotenv": "^16.4.4",
     "ethers": "^5.7.2",
+    "node-fetch": "^3.3.2",
     "npm-run-all": "^4.1.5"
   },
   "devDependencies": {
diff --git a/tsconfig.json b/tsconfig.json
index 9d5050f6..18ac9fe6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -25,7 +25,7 @@
     /* Modules */
     "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "Node16",                        /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "moduleResolution": "Node16",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */