resolve merge conflict #13

Job	Run time
matrix-prep	3s
matrix-check	0s
Building cuda-linux-x86_64 for testnet	4m 29s
Building opencl-linux-x86_64 for testnet	4m 32s
Building opencl-linux-arm64 for testnet	6m 17s
Building opencl-linux-riscv64 for testnet	5m 58s
Building opencl-macos-x86_64 for testnet	13m 54s
Building opencl-macos-arm64 for testnet	6m 35s
Building cuda-windows-x64 for testnet	20m 9s
Building opencl-windows-x64 for testnet	13m 15s
Building cuda-windows-arm64 for testnet	8m 9s
Building opencl-windows-arm64 for testnet	9m 43s
Building cuda-linux-x86_64 for nextnet	4m 32s
Building opencl-linux-x86_64 for nextnet	4m 6s
Building opencl-linux-arm64 for nextnet	5m 58s
Building opencl-linux-riscv64 for nextnet	5m 59s
Building opencl-macos-x86_64 for nextnet	12m 40s
Building opencl-macos-arm64 for nextnet	7m 44s
Building cuda-windows-x64 for nextnet	22m 28s
Building opencl-windows-x64 for nextnet	15m 12s
Building cuda-windows-arm64 for nextnet	6m 48s
Building opencl-windows-arm64 for nextnet	9m 0s
create-release	33s
	3h 8m 4s

Provide feedback