🔧 fix merge problems on rebase #398

Job	Run time
Pharo64-10 + app-config	32s
Pharo64-10 + app-control	48s
Pharo64-10 + app-info	44s
Pharo64-10 + core	34s
Pharo64-10 + dependent-sunit-extensions	35s
Pharo64-10 + deployment	53s
Pharo64-10 + development	56s
Pharo64-10 + examples	48s
Pharo64-10 + healthcheck	31s
Pharo64-10 + json-rpc	35s
Pharo64-10 + loggers	39s
Pharo64-10 + metrics	38s
Pharo64-10 + metrics-http	43s
Pharo64-10 + tests	55s
Pharo64-10 + tools	36s
Pharo64-11 + app-config	34s
Pharo64-11 + app-control	33s
Pharo64-11 + app-info	31s
Pharo64-11 + core	45s
Pharo64-11 + dependent-sunit-extensions	36s
Pharo64-11 + deployment	47s
Pharo64-11 + development	57s
Pharo64-11 + examples	47s
Pharo64-11 + healthcheck	30s
Pharo64-11 + json-rpc	30s
Pharo64-11 + loggers	47s
Pharo64-11 + metrics	30s
Pharo64-11 + metrics-http	35s
Pharo64-11 + tests	55s
Pharo64-11 + tools	37s
	20m 21s

Provide feedback