diff --git a/run_in_docker.sh b/run_in_docker.sh
index 562e881f7..db106b273 100755
--- a/run_in_docker.sh
+++ b/run_in_docker.sh
@@ -36,7 +36,11 @@ fi
 
 docker run \
     -v "$HOME"/.config/gcloud:/root/.config/gcloud \
+<<<<<<< Updated upstream
     -v $context:/workspace \
+=======
+    -v "$context":/workspace \
+>>>>>>> Stashed changes
     gcr.io/kaniko-project/executor:latest \
     --dockerfile "${dockerfile}" --destination "${destination}" --context "${context}" \
     --cache="${cache}"