chapter 12 tests
resolve merge conflicts