diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml
index 592a56b..889a3fb 100644
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@@ -6,10 +6,6 @@ on:
 jobs:
   test:
     runs-on: docker
-<<<<<<< HEAD
     container: node:latest
-=======
-    uses: alpine:latest
->>>>>>> refs/remotes/origin/mistress
     steps:
       - run: echo All Good
\ No newline at end of file