resolve conflicts

Author: vineethkuttan

vnext/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-windows",
   "entries": [
+    {
+      "date": "Sat, 25 Oct 2025 05:28:00 GMT",
+      "version": "0.0.0-canary.1001",
+      "tag": "react-native-windows_v0.0.0-canary.1001",
+      "comments": {
+        "none": [
+          {
+            "author": "[email protected]",
+            "package": "react-native-windows",
+            "commit": "ec689c30bc9f41170d164ed697d9760cea1e7554",
+            "comment": "Fix PoliCheck compliance - Replace non-inclusive terminology"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 24 Oct 2025 05:26:22 GMT",
       "version": "0.0.0-canary.1001",

vnext/Folly/TEMP_UntilFollyUpdate/json/json.cpp

@@ -908,7 +908,7 @@ void escapeStringImpl(
 
     if (encodeUnicode) {
       // note that this if condition captures utf8 chars
-      // with value > 127, so size > 1 byte (or they are whitelisted for
+      // with value > 127, so size > 1 byte (or they are allowlisted for
       // Unicode encoding).
       // NOTE: char32_t / char16_t are both unsigned.
       char32_t cp = utf8ToCodePoint(p, e, opts.skip_invalid_utf8);