diff --git a/.digital-ocean-deploy.yml b/.digital-ocean-deploy.yml
index bf5620c5c9a29e058d63bbbcf16ecedce81d8ef6..7466192c26f4589e00c2ba19f3b84075d3bfc171 100644
--- a/.digital-ocean-deploy.yml
+++ b/.digital-ocean-deploy.yml
@@ -1,8 +1,11 @@
 .deploy_digital_ocean:
   image: bitnami/kubectl:1.18.8
   script:
+<<<<<<< HEAD
     - echo $KUBERNETES_SERVER
     - echo $KUBERNETES_TOKEN
+=======
+>>>>>>> 6dabdf8fbe97da4d338ed58667aeadb8e71f30fc
     - cd k8s/$APP/overlays/$OVERLAY/
     - kustomize --insecure-skip-tls-verify --kubeconfig="/dev/null" --server=$KUBERNETES_SERVER --token=$KUBERNETES_TOKEN edit set image $CI_REGISTRY_IMAGE=$NEW_IMAGE
     - kustomize build . | kubectl --insecure-skip-tls-verify --kubeconfig="/dev/null" --server=$KUBERNETES_SERVER --token=$KUBERNETES_TOKEN  apply -f -