Local merge fix