diff --git a/chart/keel/values.yaml b/chart/keel/values.yaml
index 54452fc9e..ae46cc1ee 100644
--- a/chart/keel/values.yaml
+++ b/chart/keel/values.yaml
@@ -4,11 +4,7 @@
 
 image:
   repository: keelhq/keel
-<<<<<<< HEAD
   tag: 0.8.3
-=======
-  tag: 0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
   pullPolicy: IfNotPresent
 
 # Enable insecure registries
diff --git a/deployment/deployment-norbac.yaml b/deployment/deployment-norbac.yaml
index 224d1e1f2..e5d6fea0a 100644
--- a/deployment/deployment-norbac.yaml
+++ b/deployment/deployment-norbac.yaml
@@ -30,11 +30,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL
diff --git a/deployment/deployment-rbac.yaml b/deployment/deployment-rbac.yaml
index 08ccc3f1d..2750179eb 100644
--- a/deployment/deployment-rbac.yaml
+++ b/deployment/deployment-rbac.yaml
@@ -86,11 +86,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL
diff --git a/hack/deployment.sample.yml b/hack/deployment.sample.yml
index b23fee7b4..251cc4430 100644
--- a/hack/deployment.sample.yml
+++ b/hack/deployment.sample.yml
@@ -16,11 +16,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: keelhq/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL