diff --git a/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml b/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
index 4d3896d..a47d75e 100644
--- a/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
+++ b/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
@@ -69,4 +69,3 @@
         secret:
           secretName: google-secret
       {%- endif %}
->>>>>>> Add Google CloudDNS support to external-dns