init chapter 14
fixed chapter 14
reset master
resolved all conflict
resolved all conflict