merging all conflicts

Author: react-translations-bot

src/content/community/versioning-policy.md

@@ -8,7 +8,7 @@ title: 版本策略
 
 </Intro>
 
-For a list of previous releases, see the [Versions](/versions) page.
+This versioning policy describes our approach to version numbers for packages such as `react` and `react-dom`. For a list of previous releases, see the [Versions](/versions) page.
 
 ## 稳定版本 {/*stable-releases*/}
 
@@ -24,7 +24,13 @@ For a list of previous releases, see the [Versions](/versions) page.
 
 次要版本发布是最常见的发布类型。
 
+<<<<<<< HEAD
 ### 破坏性版本 {/*breaking-changes*/}
+=======
+We know our users continue to use old versions of React in production. If we learn of a security vulnerability in React, we release a backported fix for all major versions that are affected by the vulnerability.
+
+### Breaking changes {/*breaking-changes*/}
+>>>>>>> 91614a51a1be9078777bc337ba83fc62e606cc14
 
 破坏性改变对每个人都不方便，因此我们试图尽量减少主要版本的发布数量 - 例如，React 15 发布于 2016 年 4 月，React 16 发布于 2017 年 9 月，React 17 发布于 2020 年 10 月。