Fix another git merge error
Merge pull request #2830 from wmtan/FixAnotherGitMergeError

Fix another git merge error