conflicts part 2