diff --git a/.gitea/workflows/master-winter.yaml b/.gitea/workflows/master-winter.yaml
index 662242e..3dbae18 100644
--- a/.gitea/workflows/master-winter.yaml
+++ b/.gitea/workflows/master-winter.yaml
@@ -149,8 +149,5 @@ jobs:
           push: true
           tags: |
             git.winteraccess.id/${{ gitea.repository }}:3.20
-<<<<<<<< HEAD:.gitea/workflows/winter.yaml
-========
             git.winteraccess.id/${{ gitea.repository }}:3
->>>>>>>> b2241d5 (Added alpine linux version 3.20):.gitea/workflows/master-winter.yaml
             git.winteraccess.id/${{ gitea.repository }}:latest
\ No newline at end of file