diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml
index 3ca10f7c6..243cff4c4 100644
--- a/.github/workflows/pre_release.yml
+++ b/.github/workflows/pre_release.yml
@@ -52,8 +52,4 @@ jobs:
           files: |
             CHANGELOG_LATEST.md
             ./build/firmware/*.*
-<<<<<<< HEAD
             
-=======
-            
->>>>>>> fdbbfe8ddbbb49c610cf6ab68a0d11bc3c9855b1