fix merge conflict

Author: davidwendt

dependencies.yaml

@@ -730,12 +730,8 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-<<<<<<< HEAD
           - rapids-dask-dependency==25.10.*,>=0.0.0a0
           - nvidia-ml-py
-=======
-          - rapids-dask-dependency==25.8.*,>=0.0.0a0
->>>>>>> branch-25.08
   run_dask_cudf:
     common:
       - output_types: [conda, requirements, pyproject]