merge fix part2