docs(cn): fix conflicts

Author: QC-L

content/community/conferences.md

@@ -42,7 +42,7 @@ June 17 & 21, 2022. In-person in Amsterdam, Netherlands + remote first interacti
 
 [Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
 
-## Past Conferences {#past-conferences}
+## 往届会议 {#past-conferences}
 
 ### React Advanced 2021 {#react-advanced-2021}
 October 22-23, 2021. In-person in London, UK + remote (hybrid event)
@@ -57,11 +57,7 @@ October 16, 2021 - remote event
 ### React Brussels 2021 {#react-brussels-2021} 
 October 15, 2021 - remote event
 
-<<<<<<< HEAD
-## 往届会议 {#past-conferences}
-=======
 [Website](https://www.react.brussels/) - [Twitter](https://twitter.com/BrusselsReact) - [LinkedIn](https://www.linkedin.com/events/6805708233819336704/)
->>>>>>> bac7292df6c4a9f40dcb8bc97d88fd0a83a7b31d
 
 ### render(ATL) 2021 {#render-atlanta-2021} 
 September 13-15, 2021. Atlanta, GA, USA

content/docs/create-a-new-react-app.md

@@ -75,11 +75,7 @@ Create React App 不会处理后端逻辑或操纵数据库；它只是创建一
 
 - **[Nx](https://nx.dev/react)** 是针对全栈 monorepo 的开发工具包，其内置了 React，Next.js，[Express](https://expressjs.com/) 等。
 
-<<<<<<< HEAD
-- **[Parcel](https://parceljs.org/)** 是一个快速的、零配置的网页应用打包器，并且可以[搭配 React 一起工作](https://parceljs.org/recipes.html#react)。
-=======
-- **[Parcel](https://parceljs.org/)** is a fast, zero configuration web application bundler that [works with React](https://parceljs.org/recipes/react/).
->>>>>>> bac7292df6c4a9f40dcb8bc97d88fd0a83a7b31d
+- **[Parcel](https://parceljs.org/)** 是一个快速的、零配置的网页应用打包器，并且可以[搭配 React 一起工作](https://parceljs.org/recipes/react/)。
 
 - **[Razzle](https://github.com/jaredpalmer/razzle)** 是一个无需配置的服务端渲染框架，但它提供了比 Next.js 更多的灵活性。