diff --git a/.github/workflows/main_automation.yml b/.github/workflows/main_automation.yml
index dc9b22ba..4d5551ae 100644
--- a/.github/workflows/main_automation.yml
+++ b/.github/workflows/main_automation.yml
@@ -105,8 +105,6 @@ jobs:
         project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
         coverage-reports: ./coveragereport.xml
 
-
-
     - name: Publish dev release assets
       if: ${{ github.ref == 'refs/heads/dev' }}
       uses: SourceSprint/upload-multiple-releases@1.0.7
@@ -116,15 +114,7 @@ jobs:
         prerelease: true
         overwrite: true
         release_name: ${{ steps.gitversion.outputs.SemVer }}
-<<<<<<< HEAD
         tag_name: ${{ steps.gitversion.outputs.SemVer }}
-=======
-<<<<<<< HEAD
-        tag_name: ${{ steps.gitversion.outputs.SemVer }}
-=======
-        tag_name: latest
->>>>>>> main
->>>>>>> main
         release_config: |
           .\Calculations\bin\Release\net6.0\QuanTAlib.dll
           .\Indicators\bin\Release\QuanTAlib_Indicators.dll