conflict missed

Author: vineethkuttan

vnext/overrides.json

@@ -206,6 +206,13 @@
       "baseHash": "74cee7804fa62964c9ecc3fafd475d09b0ed6375",
       "issue": 15263
     },
+    {
+      "type": "patch",
+      "file": "ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ShadowNode.cpp",
+      "baseFile": "packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp",
+      "baseHash": "d0335398782289db2de5b350de24373458180c4d",
+      "issue": 15292
+    },
     {
       "type": "patch",
       "file": "ReactCommon/TEMP_UntilReactCommonUpdate/react/runtime/ReactInstance.cpp",