resolve merge conflicts #3239

Job	Run time
devcontainer / build (amd64, 12.0, conda)	1h 8m 9s
devcontainer / build (amd64, 12.0, pip)	1h 8m 31s
checks / other-checks	51s
checks / check-style	2m 52s
wheel-build-pylibcugraph	0s
conda-cpp-build	0s
wheel-tests-pylibcugraph	0s
conda-python-build	0s
conda-cpp-tests	0s
wheel-build-nx-cugraph	0s
wheel-build-cugraph	0s
conda-python-tests	0s
conda-notebook-tests	0s
docs-build	0s
wheel-tests-nx-cugraph	0s
wheel-tests-cugraph	0s
pr-builder	0s
	2h 20m 23s

Provide feedback