7.2 my part
chapter 7.2 conflicts resolved