Working on chapter 6
Working on chapter 6
Resolving merge conflict