modified chapter one
modified chapter two
modified chapter four
modified chapter five
conflict solved, branches merged