diff --git a/clusters/cl01tl/applications/hoarder/values.yaml b/clusters/cl01tl/applications/hoarder/values.yaml
index 7cd1416ba..79da01e39 100644
--- a/clusters/cl01tl/applications/hoarder/values.yaml
+++ b/clusters/cl01tl/applications/hoarder/values.yaml
@@ -8,11 +8,7 @@ hoarder:
       containers:
         main:
           image:
-<<<<<<< HEAD
             repository: ghcr.io/hoarder-app/hoarder
-=======
-            repository: ghcr.io/karakeep-app/karakeep
->>>>>>> 5421bd3a (follow rename of project)
             tag: 0.23.2
             pullPolicy: IfNotPresent
           env: