Fix up some Conflict (the map) bugs