merge conflict in operator #332

Job	Run time
pytest-ubuntu-py311-gcc11-noomp-base	47s
pytest-ubuntu-py311-gcc11-noomp-adjoint	47s
pytest-ubuntu-py38-gcc12-omp-base	37s
pytest-ubuntu-py38-gcc12-omp-adjoint	40s
pytest-ubuntu-py38-gcc7-omp-base	44s
pytest-ubuntu-py38-gcc7-omp-adjoint	38s
pytest-ubuntu-py310-gcc10-noomp-base	43s
pytest-ubuntu-py310-gcc10-noomp-adjoint	41s
pytest-ubuntu-py312-gcc13-omp-base	42s
pytest-ubuntu-py312-gcc13-omp-adjoint	36s
pytest-ubuntu-py39-gcc9-omp-base	42s
pytest-ubuntu-py39-gcc9-omp-adjoint	40s
pytest-osx-py312-clang-omp-base	36s
pytest-docker-py39-gcc-omp-base	2m 12s
pytest-docker-py39-gcc-omp-adjoint	2m 9s
pytest-docker-py39-icx-omp-base	2m 54s
pytest-docker-py39-icx-omp-adjoint	2m 54s
	19m 2s

Provide feedback