chapter 7, changes
solves conflictes