Remove leftover merge conflict marker

Signed-off-by: Keiven Chang <[email protected]>

Author: keivenchang

tests/fault_tolerance/cancellation/test_trtllm.py

@@ -448,7 +448,6 @@ def test_request_cancellation_trtllm_prefill_first_prefill_cancel(
                 # TODO: Why wait after worker ready fixes frontend 404 / 500 flakiness?
                 time.sleep(2)
 
->>>>>>> de716ff61 (feat: add dynamic port allocation to prevent test conflicts)
                 # Step 4: Test request cancellation during prefill phase
                 logger.info(
                     "Testing completion request cancellation during prefill phase..."