Directory created as an example about conflict resolution Suppose this is the file that is being worked on and two people are making alterations to it. Both people will make the update on the next line. Person 1 was here.