chapter 12 tests
merge and resolve conflicts