Map merge fix attempt three