resolved merge conflicts

Mash707 · Mash707 · commit 32d7047ed390 · 2025-03-10T22:54:54.000+05:30
diff --git a/yarn.lock b/yarn.lock
@@ -10191,7 +10191,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^9.22.0":
+"eslint@npm:^9.21.0":
   version: 9.22.0
   resolution: "eslint@npm:9.22.0"
   dependencies:
