Dealing with Conflict

Click story.html link to view the file.