From 3ed4f7986931134892637189e2d562aa57af3dcd Mon Sep 17 00:00:00 2001
From: Siyu Jiang <91580504+jsy1218@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:38:47 -0800
Subject: [PATCH] merge conflict

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c9471ebab..12dd64c81 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@ethersproject/address": "^5.0.0",
     "@ethersproject/solidity": "^5.0.0",
-    "@uniswap/sdk-core": "^4.1.1",
+    "@uniswap/sdk-core": "^4.1.3",
     "tiny-invariant": "^1.1.0",
     "tiny-warning": "^1.0.3"
   },
diff --git a/yarn.lock b/yarn.lock
index 980d1fa0b..bbede29f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1706,10 +1706,10 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@uniswap/sdk-core@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.1.1.tgz#c7a8a89cd126f3537a3c406a72bb70eab598963f"
-  integrity sha512-f/FTqqDuxtN52QFXwABLE/fAu/tdpYyjucXdjWVCgfHB2DVn1H84KUHs0GGhAwDDFz6G59kMbsDbvgYW4yqvQQ==
+"@uniswap/sdk-core@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.1.3.tgz#5db8c527eee89ac2467fa327bd42f0f17aee76ac"
+  integrity sha512-dbXX4Ivam5D90gwiT0MWgHSiKdl99rC0GiPcK8Pd+iFp2myypPX9ovTR3IncI3Y83mZrlBLX9XC1Q6kA/12hOg==
   dependencies:
     "@ethersproject/address" "^5.0.2"
     big.js "^5.2.2"