conflict resolution, part 2?