Fix unresolved conflict in init.cpp

Fixes build error.
Merge pull request #3286 from CIB/master

Fix unresolved conflict in init.cpp
Crap, forgot to commit after resolving locally.