Fix merge conflicts #6987

Job	Run time
workflow / start	4s
vitest / vitest	52s
playwright / playwright-tests (3, 4)	1m 36s
playwright / playwright-tests (2, 4)	4m 37s
playwright / playwright-tests (4, 4)	1m 55s
playwright / playwright-tests (1, 4)	1m 52s
workflow / build	2m 17s
workflow / deploy	0s
workflow / deploy-idporten	0s
workflow / deploy-test	-1s
playwright / merge-reports	36s
	13m 48s

Provide feedback