proof read chapter 5
proofread and solved conflict