diff --git a/manifests/forgejo/runner.yaml b/manifests/forgejo/runner.yaml
index 5a0229a..fd34a89 100644
--- a/manifests/forgejo/runner.yaml
+++ b/manifests/forgejo/runner.yaml
@@ -14,11 +14,7 @@ spec:
     spec:
       containers:
       - name: runner
-<<<<<<< HEAD
         image: forgejo.libretalk.eu/jad0s/forgejo-runner:latest
-=======
-        image: code.forgejo.org/forgejo/runner:3.5.1
->>>>>>> e1bf8ad (fix(forgejo): remove extra indentation)
         command:
           - sh
           - -c