diff --git a/.forgejo/workflows/functions.yml b/.forgejo/workflows/functions.yml
index fbf9ee9..1af8120 100644
--- a/.forgejo/workflows/functions.yml
+++ b/.forgejo/workflows/functions.yml
@@ -52,8 +52,7 @@ jobs:
           kustomize edit set image ${{ matrix.function }}=code.icb4dc0.de/infrastructure/functions/${{ matrix.function }}:${{ github.sha }}
           git add kustomization.yaml
           git commit -m "chore(deploy): update ${{ matrix.function }} image reference"
-          git push
-        working-directory: deploy
+          git push || git pull --rebase && git push
 
   deploy:
     runs-on: ubuntu-latest
diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
index 4367489..f4674dc 100644
--- a/deploy/kustomization.yaml
+++ b/deploy/kustomization.yaml
@@ -5,6 +5,7 @@ namespace: functions
 
 
 images:
+<<<<<<< HEAD
 - name: blob-proxy
   newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
   newTag: 8897bbe4eb0653695c5951a3dc1ec096d6ef8771
@@ -18,6 +19,22 @@ resources:
 - resources/routes.yaml
 - apps/comics.yaml
 - apps/blob-proxy.yaml
+=======
+  - name: comics
+    newName: code.icb4dc0.de/infrastructure/functions/comics
+    newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
+
+  - name: blob-proxy
+    newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
+    newTag: latest
+
+resources:
+  - resources/namespace.yaml
+  - resources/executor.yaml
+  - resources/routes.yaml
+  - apps/comics.yaml
+  - apps/blob-proxy.yaml
+>>>>>>> 6beb26c (feat: migrate blob proxy)
 
 configurations:
-- kustomizeconfig/spinapp.yaml
+  - kustomizeconfig/spinapp.yaml