merge conflict resolution
Updated chapter 4