Fix resolve token conflict logic under race condition#7554

alexqyle wants to merge 4 commits into

cortexproject:mastercortexproject/cortex:masterfrom

alexqyle:duplicate-tokenalexqyle/cortex:duplicate-tokenCopy head branch name to clipboard