update
corrections
reorder chapters
merge conflicts