diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
index f4674dc..eb57a26 100644
--- a/deploy/kustomization.yaml
+++ b/deploy/kustomization.yaml
@@ -3,38 +3,20 @@ kind: Kustomization
 
 namespace: functions
 
-
 images:
-<<<<<<< HEAD
-- name: blob-proxy
-  newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
-  newTag: 8897bbe4eb0653695c5951a3dc1ec096d6ef8771
-- name: comics
-  newName: code.icb4dc0.de/infrastructure/functions/comics
-  newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
-
-resources:
-- resources/namespace.yaml
-- resources/executor.yaml
-- resources/routes.yaml
-- apps/comics.yaml
-- apps/blob-proxy.yaml
-=======
+  - name: blob-proxy
+    newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
+    newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
   - 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