upgrade chapter 1
upgrade 2.1 and 2.2
fix confilcts
upgrade chapter 2