Fixed version merge issues. Map is now visible.