diff --git a/app/.env b/app/.env
index 5a0dc38..63f4056 100644
--- a/app/.env
+++ b/app/.env
@@ -13,13 +13,8 @@ client_name=ShuFuAI
 
 
 # java_api_base=http://47.111.163.154:18080
-<<<<<<< HEAD
-# java_api_base=http://127.0.0.1:18080
-java_api_base=http://8.136.19.173:18080
-=======
 java_api_base=http://127.0.0.1:18080
 # java_api_base=http://8.136.19.173:18080
 # java_api_base=http://121.196.149.225:18080
->>>>>>> e4bf104ae20efcb34816c5d3da9c3372ecd92d93
 
 
diff --git a/app/amazon/__pycache__/detail_spider.cpython-312.pyc b/app/amazon/__pycache__/detail_spider.cpython-312.pyc
index a861801..7b450aa 100644
Binary files a/app/amazon/__pycache__/detail_spider.cpython-312.pyc and b/app/amazon/__pycache__/detail_spider.cpython-312.pyc differ