updated ch3
updated ch2, ch4
solving conflicts