Fix semantic merge confict in vortex-tensor#7299

connortsui20 merged 1 commit intodevelopvortex-data/vortex:developfrom

ct/fix-semantic-merge-tensorvortex-data/vortex:ct/fix-semantic-merge-tensorCopy head branch name to clipboard