(Build fix) Gets rid of weird conflict

Fixes the build failure, e-merging.