Fix a merge conflict #887

Job	Run time
docker-master	1h 30m 0s
publish-standalone-dry-run	14s
test-standalone (master, dev, default)	1m 21s
build-js-of-ocaml (master, 4.11.1)	5m 43s
validate-docker-master	21m 44s
generated-files (master)	32s
build-wasm-of-ocaml (master, 4.14.1)	18m 18s
standalone-haskell (master)	48m 13s
test-amd64	2h 16m 57s
deploy-js-wasm-of-ocaml	1m 20s
docker-check-all	1s
	5h 24m 23s

Provide feedback