diff --git a/.ai_cache/service_config.json b/.ai_cache/service_config.json
index c983853..cfc6619 100644
--- a/.ai_cache/service_config.json
+++ b/.ai_cache/service_config.json
@@ -6,9 +6,13 @@
     "gemini"
   ],
   "summary_language": "zh",
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
   "check_time": "2025-07-15T23:27:54.141436"
 =======
   "check_time": "2025-07-12T17:33:43.408549"
 >>>>>>> Stashed changes
+=======
+  "check_time": "2025-07-12T17:33:43.408549"
+>>>>>>> Stashed changes
 }
\ No newline at end of file
diff --git a/.cache/plugin/git-committers/page-authors.json b/.cache/plugin/git-committers/page-authors.json
index 122bb9c..69ee8bb 100644
--- a/.cache/plugin/git-committers/page-authors.json
+++ b/.cache/plugin/git-committers/page-authors.json
@@ -1,5 +1,9 @@
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 {"cache_date": "2025-07-15", "page_authors": {}}
 =======
 {"cache_date": "2025-07-12", "page_authors": {}}
 >>>>>>> Stashed changes
+=======
+{"cache_date": "2025-07-12", "page_authors": {}}
+>>>>>>> Stashed changes