diff --git a/mkdocs.yml b/mkdocs.yml
index 3fa2459..7592fd0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -243,11 +243,8 @@ extra_javascript:
 extra_css:
   - stylesheets/extra.css # 自定义CSS
   - stylesheets/link.css  #友链配置
-<<<<<<< Updated upstream
-  - stylesheets/customize.css
-=======
   - stylesheets/customize.css # 搜索圆角优化
->>>>>>> Stashed changes
+  
   # - stylesheets/video.css #播放器可选配置
   # - https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.css #gitalk支持
   # - ckplayer/css/ckplayer.css   #播放器配置