Fixed deleted map stuff from merge