finished chapter 3 correction
resolve merge conflict