diff --git a/.forgejo/workflows/.build.yaml.kate-swp b/.forgejo/workflows/.build.yaml.kate-swp
deleted file mode 100644
index e69de29..0000000
diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index b7a34f3..b6e8d38 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -1,10 +1,6 @@
 on: [push]
 jobs:
   test:
-<<<<<<< HEAD
-    runs-on: docker
-=======
     runs-on: minecrap
->>>>>>> refs/remotes/origin/master
     steps:
       - run: echo All Good