diff --git a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
index dd48419eb..c0c48442c 100644
--- a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
+++ b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
@@ -26,27 +26,42 @@ jobs:
           git config --global user.email "qdraw@users.noreply.github.com"
           git config --global user.name "Global npm resolve conflicting files fix script"
           
+      - name: Backup package.json files
+        run: |
+          for project in ${{ env.projects }}; do
+            cp $project/package.json /tmp/$project-package.json
+          done
+          
       - name: Merge master into branch
         run: |
           git fetch origin
           git checkout ${{ github.head_ref }}
           git merge origin/master -X theirs --allow-unrelated-histories
 
-      - name: Resolve package-lock.json conflicts
+      - name: Restore package.json files
         run: |
           for project in ${{ env.projects }}; do
-            echo "Checking for conflicts in $project/package-lock.json"
-            if ! git diff --exit-code $project/package-lock.json > /dev/null; then
-              echo "Conflicts detected in $project/package-lock.json"
-              git checkout --theirs $project/package-lock.json
-              npm install --prefix $project
+            cp /tmp/$project-package.json $project/package.json
+          done
+
+      - name: Check for changes in package.json
+        run: |
+          for project in ${{ env.projects }}; do
+            if ! git diff --exit-code $project/package.json > /dev/null; then
+              echo "Changes detected in $project/package.json"
+              git add $project/package.json
+              
+              cd $project
+                npm install
+              cd -
+              
               git add $project/package-lock.json
-              echo "Conflicts resolved and changes added for $project/package-lock.json"
+
             else
-              echo "No conflicts detected in $project/package-lock.json"
+              echo "No changes detected in $project/package.json"
             fi
           done
-          git diff-index --quiet HEAD || git commit -m "Resolve package-lock.json conflicts"
+          git diff-index --quiet HEAD || git commit -m "Check in package.json changes"
 
       - name: Push changes
         env:
diff --git a/documentation/package-lock.json b/documentation/package-lock.json
index df25ab2d6..579ffc9f7 100644
--- a/documentation/package-lock.json
+++ b/documentation/package-lock.json
@@ -19,7 +19,7 @@
       },
       "devDependencies": {
         "@docusaurus/module-type-aliases": "3.6.0",
-        "@docusaurus/tsconfig": "3.6.1",
+        "@docusaurus/tsconfig": "^3.7.0",
         "@docusaurus/types": "3.6.3",
         "typescript": "~5.7.2"
       },
@@ -4492,9 +4492,9 @@
       }
     },
     "node_modules/@docusaurus/tsconfig": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/tsconfig/-/tsconfig-3.6.1.tgz",
-      "integrity": "sha512-RvjMG9M9YK8N/I5oudqJed8jjfWGI7csr4XCkGXBToNkkoi2QgkTz2DxH+obKdfLejQaASdIMynYaE5Lv7Qw9Q==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/tsconfig/-/tsconfig-3.7.0.tgz",
+      "integrity": "sha512-vRsyj3yUZCjscgfgcFYjIsTcAru/4h4YH2/XAE8Rs7wWdnng98PgWKvP5ovVc4rmRpRg2WChVW0uOy2xHDvDBQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -16669,6 +16669,13 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/search-insights": {
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/section-matter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
@@ -17730,7 +17737,6 @@
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
diff --git a/documentation/package.json b/documentation/package.json
index 9a5cd7ce5..e03fc3112 100644
--- a/documentation/package.json
+++ b/documentation/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.6.0",
-    "@docusaurus/tsconfig": "3.6.1",
+    "@docusaurus/tsconfig": "3.7.0",
     "@docusaurus/types": "3.6.3",
     "typescript": "~5.7.2"
   },