Conflict fix take 2 part 1