fix: check for double definition (cherry-pick #15670)#16271

ishitasequeira merged 1 commit intorelease-2.9argoproj/argo-cd:release-2.9from

cherry-pick-b6c0b0-release-2.9argoproj/argo-cd:cherry-pick-b6c0b0-release-2.9Copy head branch name to clipboard