diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 19696863..b8dfe5fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,6 @@ jobs:
         with:
           fetch-depth: 0
 
-<<<<<<< HEAD
       - name: Get frontend version
         uses: avides/actions-project-version-check@v1.4.0
         id: frontend_version
@@ -33,7 +32,7 @@ jobs:
         with:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           VERSION: ${{ steps.frontend_version.outputs.version }}
-=======
+
       #      - name: Get frontend version
       #        uses: avides/actions-project-version-check@v1.4.0
       #        id: frontend_version
@@ -47,7 +46,7 @@ jobs:
       #        with:
       #          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       #          VERSION: ${{ steps.frontend_version.outputs.version }}
->>>>>>> 7d9815f (initial commit)
+
 
       - uses: yesolutions/mirror-action@master
         with: