Fix merge conflict

Author: pragupta

.ci/docker/requirements-ci.txt

@@ -136,12 +136,6 @@ numba==0.61.2 ; python_version > "3.9"
 #test_nn.py, test_namedtensor.py, test_linalg.py, test_jit_cuda_fuser.py,
 #test_jit.py, test_indexing.py, test_datapipe.py, test_dataloader.py,
 #test_binary_ufuncs.py
-<<<<<<< HEAD
-numpy==2.0.2 ; python_version == "3.9"
-numpy==2.1.2 ; python_version > "3.9"
-
-pandas==2.2.3
-=======
 numpy==1.22.4; python_version == "3.10"
 numpy==1.26.2; python_version == "3.11" or python_version == "3.12"
 numpy==2.1.2; python_version >= "3.13" and python_version < "3.14"
@@ -150,7 +144,6 @@ numpy==2.3.4; python_version >= "3.14"
 pandas==2.0.3; python_version < "3.13"
 pandas==2.2.3; python_version >= "3.13" and python_version < "3.14"
 pandas==2.3.3; python_version >= "3.14"
->>>>>>> upstream/main
 
 #onnxruntime
 #Description: scoring engine for Open Neural Network Exchange (ONNX) models
@@ -261,14 +254,9 @@ scikit-image==0.22.0
 #Pinned versions: 0.20.3
 #test that import:
 
-<<<<<<< HEAD
-scipy==1.13.1 ; python_version == "3.9"
-scipy==1.14.1 ; python_version > "3.9"
-=======
 scipy==1.10.1 ; python_version <= "3.11"
 scipy==1.14.1 ; python_version > "3.11" and python_version < "3.14"
 scipy==1.16.2 ; python_version >= "3.14"
->>>>>>> upstream/main
 # Pin SciPy because of failing distribution tests (see #60347)
 #Description: scientific python
 #Pinned versions: 1.10.1