diff --git a/.github/workflows/upy.yml b/.github/workflows/upy.yml
index 7eae8456..fc3f8778 100644
--- a/.github/workflows/upy.yml
+++ b/.github/workflows/upy.yml
@@ -5,11 +5,7 @@ on:
     branches:
       - main  # 根据您的实际情况修改分支名称
   schedule:
-<<<<<<< HEAD
     - cron: '0 */12 * * *'   # 每十二小时自动构建一次
-=======
-    - cron: '0 */12 * * *'   # 每三小时自动构建一次
->>>>>>> b533295500100e41380a58ca463365f2b8e12cd5
 
 jobs:
   deploy: