Conflicts Chapter

Added Conflicts Chapter