going through chapter 6. No functional changes
attempting to fix conflicts