Resolve rebase conflicts. Update code for splitup of mapgen.cpp