Merge chapter 6