merge fix take 2