diff --git a/web/JiShe.CollectBus.Host/appsettings.json b/web/JiShe.CollectBus.Host/appsettings.json
index 585d7b7..9d1f7cb 100644
--- a/web/JiShe.CollectBus.Host/appsettings.json
+++ b/web/JiShe.CollectBus.Host/appsettings.json
@@ -84,12 +84,7 @@
     "SaslPassword": "lixiao1980",
     "KafkaReplicationFactor": 3,
     "NumPartitions": 30,
-<<<<<<< HEAD
-    "ServerTagName": "JiSheCollectBus99"
-=======
-    "ServerTagName": "JiSheCollectBus3",
-    "FirstCollectionTime": "2025-04-18 00:00:00"
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
+    "ServerTagName": "JiSheCollectBus2"
   },
   "IoTDBOptions": {
     "UserName": "root",
@@ -100,10 +95,7 @@
     "OpenDebugMode": true,
     "UseTableSessionPoolByDefault": false
   },
-<<<<<<< HEAD
-  "ServerTagName": "JiSheCollectBus", 
-=======
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
+  "ServerTagName": "JiSheCollectBus3", 
   "Cassandra": {
     "ReplicationStrategy": {
       "Class": "NetworkTopologyStrategy", //策略为NetworkTopologyStrategy时才会有多个数据中心，SimpleStrategy用在只有一个数据中心的情况下