Fix the build after botched git merge