feat: merge changes before transferring ownership #318

Job	Run time
build-image / Build Image	3m 22s
build / Run Build	1m 44s
lint / Run Linters	1m 59s
lint / Lint Commit Messages	14s
test / Unit and Integration Tests	1m 21s
e2e-tests / E2E Tests	2m 54s
	11m 34s

Provide feedback