merge fix keeps coming back…