Fix merge conflict #655

Job	Run time
Doxygen check	12s
Compute matrix	5s
Verify Dev Containers / Verify devcontainers	9s
CUDA12.5 gcc / amd64 / Build gcc12/C++17 / Build gcc12/C++17	4m 13s
CUDA12.5 gcc / arm64 / Build gcc12/C++17 / Build gcc12/C++17	4m 18s
CUDA12.5 gcc / amd64 / Build gcc13/C++17 / Build gcc13/C++17	4m 54s
CUDA11.8 gcc / amd64 / Build gcc11/C++17 / Build gcc11/C++17	3m 48s
Verify Dev Containers / List devcontainers	2s
Verify Dev Containers / cuda11.8-gcc11	52s
Verify Dev Containers / cuda12.5-gcc13	1m 11s
Verify Dev Containers / cuda12.4-gcc12	55s
Verify Dev Containers / cuda12.5-gcc13	1m 2s
Verify Dev Containers / cuda12.5-gcc12	1m 1s
CUDA12.5 gcc / amd64 / Test gcc12/C++17 / Test gcc12/C++17	6m 13s
CUDA12.5 gcc / arm64 / Test ${{ inputs.test_name }}	0s
CUDA12.5 gcc / amd64 / Test ${{ inputs.test_name }}	0s
CUDA11.8 gcc / amd64 / Test gcc11/C++17 / Test gcc11/C++17	4m 57s
CI success	1s
	33m 53s

Provide feedback