Solving yarn lock conflict

yarn.lock

@@ -2178,17 +2178,10 @@
   dependencies:
     ethers "~5.7.2"
 
-<<<<<<< HEAD
-"@masa-finance/masa-sdk@^1.15.2":
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-1.15.2.tgz#d9ac0815fcf752c73b89ceebae9327ac898d56bc"
-  integrity sha512-+ukES9xYccpUzjvnuMmT7fqqxIW4eV4W8x2+7aWdW34D7H/7B+oWpOo+1AyrHVlkti6WjxGNQz1mbsXZ5nLcXw==
-=======
 "@masa-finance/masa-sdk@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-2.0.3.tgz#624747bc88f029d87f1a14315f866b97ef833da4"
   integrity sha512-miqYLM+1eC+B6f4C1KJEp26ByffESjki8o/cf1MqGjWKc3tjVmmhpqRfZ589nlUKPdQvvHuzWBVmnBvMBCYEKg==
->>>>>>> b65976fde3c26831d68e75b8c2056071d109bd18
   dependencies:
     "@masa-finance/masa-contracts-identity" "^1.6.1"
     "@masa-finance/masa-token" "^2.0.0"
@@ -3796,20 +3789,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-<<<<<<< HEAD
-"@storybook/preview-api@^7.0.2":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.5.tgz#7b664d1f99a374df06da1c45e6d2a54b6ebff64e"
-  integrity sha512-mZruATt5JXfLuXJfOo30WCXILXjK+hs0HwtUDGRVW/J4Ql8CdNPB+WF56ZgeWUnMAYRf392bN3uNwmZx4v4Fog==
-  dependencies:
-    "@storybook/channel-postmessage" "7.0.5"
-    "@storybook/channels" "7.0.5"
-    "@storybook/client-logger" "7.0.5"
-    "@storybook/core-events" "7.0.5"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.0.5"
-=======
 "@storybook/preview-api@7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.9.tgz#59fbf99e3f4d94263a65ba486f3e5be853ba4fee"
@@ -3822,7 +3801,27 @@
     "@storybook/csf" "^0.1.0"
     "@storybook/global" "^5.0.0"
     "@storybook/types" "7.0.9"
->>>>>>> b65976fde3c26831d68e75b8c2056071d109bd18
+    "@types/qs" "^6.9.5"
+    dequal "^2.0.2"
+    lodash "^4.17.21"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    synchronous-promise "^2.0.15"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
+"@storybook/preview-api@^7.0.2":
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.5.tgz#7b664d1f99a374df06da1c45e6d2a54b6ebff64e"
+  integrity sha512-mZruATt5JXfLuXJfOo30WCXILXjK+hs0HwtUDGRVW/J4Ql8CdNPB+WF56ZgeWUnMAYRf392bN3uNwmZx4v4Fog==
+  dependencies:
+    "@storybook/channel-postmessage" "7.0.5"
+    "@storybook/channels" "7.0.5"
+    "@storybook/client-logger" "7.0.5"
+    "@storybook/core-events" "7.0.5"
+    "@storybook/csf" "^0.1.0"
+    "@storybook/global" "^5.0.0"
+    "@storybook/types" "7.0.5"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -3995,17 +3994,6 @@
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
-<<<<<<< HEAD
-"@storybook/types@7.0.5", "@storybook/types@^7.0.2":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.5.tgz#d8a3a5aa2dc33f7b81df2833e09d3eaa2f6c9c3c"
-  integrity sha512-By+tF3B30QiCnzEJ+Z73M2usSCqBWEmX4OGT1KbiEzWekkrsfCfpZwfzeMw1WwdQGlB1gLKTzB8wZ1zZB8oPtQ==
-  dependencies:
-    "@storybook/channels" "7.0.5"
-    "@types/babel__core" "^7.0.0"
-    "@types/express" "^4.7.0"
-    file-system-cache "^2.0.0"
-=======
 "@storybook/theming@7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.9.tgz#88060a48c22ad72c065f175c1332d22f599f7d15"
@@ -4015,7 +4003,16 @@
     "@storybook/client-logger" "7.0.9"
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
->>>>>>> b65976fde3c26831d68e75b8c2056071d109bd18
+
+"@storybook/types@7.0.5", "@storybook/types@^7.0.2":
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.5.tgz#d8a3a5aa2dc33f7b81df2833e09d3eaa2f6c9c3c"
+  integrity sha512-By+tF3B30QiCnzEJ+Z73M2usSCqBWEmX4OGT1KbiEzWekkrsfCfpZwfzeMw1WwdQGlB1gLKTzB8wZ1zZB8oPtQ==
+  dependencies:
+    "@storybook/channels" "7.0.5"
+    "@types/babel__core" "^7.0.0"
+    "@types/express" "^4.7.0"
+    file-system-cache "^2.0.0"
 
 "@storybook/types@7.0.7":
   version "7.0.7"
@@ -12363,7 +12360,7 @@ postcss-loader@^4.2.0:
     schema-utils "^3.0.0"
     semver "^7.3.4"
 
-postcss-loader@^7.3.0:
+postcss-loader@^7.2.4, postcss-loader@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.0.tgz#05991c1e490d8ff86ef18358d87db3b5b2dcb5f5"
   integrity sha512-qLAFjvR2BFNz1H930P7mj1iuWJFjGey/nVhimfOAAQ1ZyPpcClAxP8+A55Sl8mBvM+K2a9Pjgdj10KpANWrNfw==