fix: check for double definition cherry-pick release-2.8#16435

ishitasequeira merged 1 commit intoargoproj:release-2.8argoproj/argo-cd:release-2.8from

blakepettersson:cherry-pick-15670-v2-2.8blakepettersson/argo-cd:cherry-pick-15670-v2-2.8Copy head branch name to clipboard