merge fix part 2