chore: remove conflict

components/calendar/index.en-US.md

@@ -50,9 +50,6 @@ When data is in the form of dates, such as schedules, timetables, prices calenda
 
 ## FAQ
 
-<<<<<<< HEAD
-
 - # [How to use Calendar with customize date library](/docs/react/use-custom-date-library#Calendar)
 - [How to use Calendar with customize date library like dayjs](/docs/react/replace-moment#Calendar)
 - [How to set locale for date-related components](/components/date-picker/#Localization)
-  > > > > > > > origin/master

components/calendar/index.zh-CN.md

@@ -51,9 +51,6 @@ cover: https://gw.alipayobjects.com/zos/antfincdn/dPQmLq08DI/Calendar.svg
 
 ## FAQ
 
-<<<<<<< HEAD
-
 - # [如何在 Calendar 中使用自定义日期库](/docs/react/use-custom-date-library#Calendar)
 - [如何在 Calendar 中使用自定义日期库（如 dayjs ）](/docs/react/replace-moment#Calendar)
 - [如何给日期类组件配置国际化](/components/date-picker/#%E5%9B%BD%E9%99%85%E5%8C%96%E9%85%8D%E7%BD%AE)
-  > > > > > > > origin/master