diff --git a/deploy.py b/deploy.py
index 9b0df3a..048183c 100644
--- a/deploy.py
+++ b/deploy.py
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# 只是一个 dummy file
-=======
 import os
 import random
 
@@ -125,4 +122,3 @@ if __name__ == "__main__":
         except Exception as e:
             print(f"Error writing file: {e}")
             continue
->>>>>>> main