diff --git a/content.zh/docs/学术资源/学科在线资源/_index.md b/content.zh/docs/学术资源/学科在线资源/_index.md
index a906ee8..1a58801 100644
--- a/content.zh/docs/学术资源/学科在线资源/_index.md
+++ b/content.zh/docs/学术资源/学科在线资源/_index.md
@@ -49,12 +49,8 @@ bookCollapseSection: true
 - Robin Bao
 - Boven Jiang
 - Tobby Xu
-<<<<<<< HEAD:content.zh/docs/学术资源/学科在线资源/_index.md
 - Derrick Jiang
 - [James Zhou](https://www.jamesflare.com)
-=======
-- [James Zhou](https://jamesflare.com)
->>>>>>> master:content.en/docs/学术资源/学科在线资源/_index.md
 - Angel Hu
 
 <--->
@@ -73,13 +69,10 @@ bookCollapseSection: true
 
 <--->
 
-<<<<<<< HEAD:content.zh/docs/学术资源/学科在线资源/_index.md
 ### 物理
 
 - Derrick Jiang
 
-=======
->>>>>>> master:content.en/docs/学术资源/学科在线资源/_index.md
 ### 开发
 
 - [James Zhou](https://www.jamesflare.com)