diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index 198930ebb2..5184daf5c8 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -3,10 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-<<<<<<< HEAD
-=======
       - version-14
->>>>>>> 7108dfb (chore: update semantic-release workflow config)
       - version-15
 jobs:
   release:
@@ -33,4 +30,4 @@ jobs:
           GIT_AUTHOR_EMAIL: "devs@earthianslive.com"
           GIT_COMMITTER_NAME: "earthians PR Bot"
           GIT_COMMITTER_EMAIL: "devs@earthianslive.com"
-        run: npx semantic-release
\ No newline at end of file
+        run: npx semantic-release