diff --git a/docker/windows/runner/runner.ps1 b/docker/windows/runner/runner.ps1
index 9e96a5e58174..3e1dfb0c1477 100644
--- a/docker/windows/runner/runner.ps1
+++ b/docker/windows/runner/runner.ps1
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 .\actions-runner\config.cmd --unattended --replace --url https://github.com/${env:RUNNER_REPO} --token $env:RUNNER_TOKEN --name $env:RUNNER_NAME --work $env:RUNNER_WORKDIR --labels $env:RUNNER_LABELS;
 .\actions-runner\run.cmd;
+=======
+C:\actions-runner\config.cmd --unattended --replace --url https://github.com/${env:RUNNER_REPO} --token $env:RUNNER_TOKEN --name $env:RUNNER_NAME --work $env:RUNNER_WORKDIR --ephemeral --labels $env:RUNNER_LABELS;
+C:\actions-runner\run.cmd;
+>>>>>>> ae22bddb308 (Add --ephemeral option to win runner (#3239))