conflict fix part 1