GONRG-5113: resolve conflict

6 jobs for GONRG-5113-camel-case-register-helm in 56 seconds (queued for 3 seconds)