diff --git a/kubernetes/pool/kubelet.sls b/kubernetes/pool/kubelet.sls
index 4667e40..69aada3 100644
--- a/kubernetes/pool/kubelet.sls
+++ b/kubernetes/pool/kubelet.sls
@@ -18,6 +18,7 @@
     - mode: 644
     - makedirs: true
 
+<<<<<<< HEAD
 /etc/kubernetes/config:
   file.absent