Fix geocat from merge