Fix unresolved conflict in init.cpp

Fixes build error.