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