docs(en): merging all conflicts

Author: docschina-bot

src/content/community/team.md

@@ -74,8 +74,13 @@ React 核心团队成员全职致力于核心组件 API 的开发，负责 React
     Sebastian 主修心理学。他通常比较沉默寡言。即使他说些什么，我们其他人通常也要等几个月后才能理解他的意思。他的姓氏正确的发音是“mark-boa-geh”，但出于实用考虑，他接受了“mark-beige”的发音——这也是他处理 React 问题的方式。
 </TeamMember>
 
+<<<<<<< HEAD
 <TeamMember name="Sebastian Silbermann" permalink="sebastian-silbermann" photo="/images/team/sebsilbermann.jpg" github="eps1lon" twitter="sebsilbermann" threads="sebsilbermann" title="Independent Engineer">
     Sebastian 学习编程的目的是让他在课堂上玩的浏览器游戏变得更有趣。最终，这引领他尽可能多地为开源代码做贡献。在编程之外，他忙于确保人们不会把他和 React 社区的其他 Sebastians 和 Zilberman 混淆。
+=======
+<TeamMember name="Sebastian Silbermann" permalink="sebastian-silbermann" photo="/images/team/sebsilbermann.jpg" github="eps1lon" twitter="sebsilbermann" threads="sebsilbermann" title="Engineer at Vercel">
+    Sebastian learned programming to make the browser games he played during class more enjoyable. Eventually this lead to contributing to as much open source code as possible. Outside of coding he's busy making sure people don't confuse him with the other Sebastians and Zilberman of the React community.
+>>>>>>> d661678b86fd906689a836385736e80bb82a4ade
 </TeamMember>
 
 <TeamMember name="Seth Webster" permalink="seth-webster" photo="/images/team/seth.jpg" github="sethwebster" twitter="sethwebster" threads="sethwebster" personal="sethwebster.com" title="Engineering Manager at Meta">