diff --git a/更新.md b/更新.md
index 67ec687..2f32f2c 100644
--- a/更新.md
+++ b/更新.md
@@ -1,5 +1,4 @@
 ### 更新
-<<<<<<< HEAD
 - 10.18
 > 更新V2ray节点
 -10.9