diff --git a/.gitea/workflows/compile-artifact.yml b/.gitea/workflows/compile-artifact.yml
index 90da28f..66b8f78 100644
--- a/.gitea/workflows/compile-artifact.yml
+++ b/.gitea/workflows/compile-artifact.yml
@@ -13,21 +13,13 @@ jobs:
           fetch-depth: 0
 
       - name: Compile Spearhead
-<<<<<<< HEAD
         uses: https://git.dutchie031.com/dutchie031/DcsMissionScriptingTools/github-action@action/v0
-=======
-        uses: https://git.dutchie031.com/dutchie031/DcsMissionScriptingTools@action/v0
->>>>>>> origin/main
         with:
           source-root: ./src
           output-file: ./output/spearhead.lua
 
       - name: Upload spearhead.lua artifact
-<<<<<<< HEAD
         uses: actions/upload-artifact@v3
-=======
-        uses: actions/upload-artifact@v7
->>>>>>> origin/main
         with:
           name: spearhead-lua
           path: ./output/spearhead.lua
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 13c4272..9eee41b 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
         echo "Version: $VERSION"
 
     - name: Compile Spearhead
-      uses: https://git.dutchie031.com/dutchie031/DcsMissionScriptingTools@action/v0
+      uses: https://git.dutchie031.com/dutchie031/DcsMissionScriptingTools/github-action@action/v0
       with:
         source-root: ./src
         output-file: ./output/spearhead.lua