diff --git a/src/vllm_router/run-router.sh b/src/vllm_router/run-router.sh
index 31ad8f4f..4137a46f 100755
--- a/src/vllm_router/run-router.sh
+++ b/src/vllm_router/run-router.sh
@@ -4,7 +4,6 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
-<<<<<<< HEAD
 # Use this command when testing with k8s service discovery
 # python3 -m vllm_router.router --port "$1" \
 #     --service-discovery k8s \
@@ -14,16 +13,6 @@ fi
 #     --session-key "x-user-id" \
 #     --engine-stats-interval 10 \
 #     --log-stats
-=======
-python3 vllm_router/router.py --port "$1" \
-    --service-discovery k8s \
-    --k8s-label-selector release=test \
-    --k8s-namespace default \
-    --routing-logic session \
-    --session-key "x-user-id" \
-    --engine-stats-interval 10 \
-    --log-stats
->>>>>>> 694f804 (update the router and vllm-dashboard to align with the reference from @YuhanLiu11)
 
 # Use this command when testing with static service discovery
 python3 -m vllm_router.router --port "$1" \