hi
conflicts
finished chapter 6