Solving conflict part 2