Gets rid of weird conflict

Fixes the build failure, e-merging.
Merge pull request #7616 from KA101/remerge

(Build fix) Gets rid of weird conflict