chore: fix merge conflicts #138

Job	Run time
Hadolint (./validator/docker/csv-validator/Dockerfile)	5s
Go lint (./registry)	7s
Check editor config	8s
Hadolint (./validator/docker/validator/Dockerfile)	6s
3rd party licenses check	42s
Go lint (./validator)	37s
Hadolint (./validator/docker/xml-validator/Dockerfile)	8s
Hadolint (./registry/docker/compatibility-checker/Dockerfile)	5s
Test docker image builds (./validator/docker/csv-validator/Dockerfile, schema-registry-csv-val)	29s
Test job (./registry)	8s
Validate PR title	3s
Hadolint (./registry/docker/initdb/Dockerfile)	7s
Test docker image builds (./validator/docker/validator/Dockerfile, schema-registry-validator)	57s
Test job (./validator)	20s
Hadolint (./registry/docker/registry/Dockerfile)	6s
Test docker image builds (./validator/docker/xml-validator/Dockerfile, schema-registry-xml-val)	10s
Hadolint (./registry/docker/validity-checker/Dockerfile)	8s
Test docker image builds (./registry/docker/compatibility-checker/Dockerfile, schema-registry-com...	1m 28s
Test docker image builds (./registry/docker/initdb/Dockerfile, schema-registry-initdb)	23s
Test docker image builds (./registry/docker/registry/Dockerfile, schema-registry-api)	30s
Test docker image builds (./registry/docker/validity-checker/Dockerfile, schema-registry-validity)	27s
	7m 14s

Provide feedback