diff --git a/LICENSE b/LICENSE
index 656ca01..44e3bc6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,26 +1,5 @@
 MIT License
 
-<<<<<<< HEAD
-Copyright (c) 2026 TZYCeng
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=======
 Copyright (c) 2026 y0lo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
@@ -37,4 +16,4 @@ LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE A
 EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
 USE OR OTHER DEALINGS IN THE SOFTWARE.
->>>>>>> 558bcd8abb48f869ac425cbb85e248b450ddc36e
+
diff --git a/README.md b/README.md
index 4fff2e4..348c5ff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # AstrBOT 守望先锋国际服查询插件
 作者其实是个小白来的，部分由ai创建
 # 注意,部分使用steam启动的玩家无法被查询
@@ -67,8 +66,4 @@ pip install -r requirements.txt
 ## 📕 更新日志
 
 版本更新记录已迁移至 [CHANGELOG.md](CHANGELOG.md)。
-=======
-# overwatch_bot
 
-an agent to fetch and analysis overwatch datastics
->>>>>>> 558bcd8abb48f869ac425cbb85e248b450ddc36e