diff --git a/argocd/ingress.yaml b/argocd/ingress.yaml
index fa3fe45..9cbb892 100644
--- a/argocd/ingress.yaml
+++ b/argocd/ingress.yaml
@@ -4,11 +4,7 @@ metadata:
   name: django
   namespace: vorgabenui
   annotations:
-<<<<<<< Updated upstream
     argocd.argoproj.io/ignore-healthcheck: "true"
-=======
-    nginx.ingress.kubernetes.io/rewrite-target: /
->>>>>>> Stashed changes
 spec:
   ingressClassName: traefik
   rules: