conflict resolution part 1

setting up a conflict