resolve merge conflicts

Author: gewarren

docfx.json

@@ -44,7 +44,7 @@
       "recommendations": true,
       "author": "dotnet-bot",
       "ms.author": "dotnetcontent",
-      "ms.date": "05/16/2023",
+      "ms.date": "07/01/2025",
       "searchScope": [".NET"],
       "show_latex": true,
       "uhfHeaderId": "MSDocsHeader-DotNet",
@@ -73,15 +73,11 @@
     "fileMetadata": {
       "author": {
         "api/System.Net**.yml": "karelz",
-        "api/System.Web**.yml": "Rick-Anderson",
-        "api/Microsoft.VisualBasic**.yml": "KathleenDollard"
+        "api/Microsoft.VisualBasic**.yml": "BillWagner"
       },
       "ms.author": {
         "api/System.Net**.yml": "ncldev",
-        "api/Microsoft.VisualBasic**.yml": "kdollard"
-      },
-      "ms.custom": {
-        "api/System.String.Split.yml": "contperf-fy21q2"
+        "api/Microsoft.VisualBasic**.yml": "wiwagn"
       },
       "ms.subservice": {
         "api/Accessibility**.yml": "accessibility",