add file
add chapter2 files
add chapter3 files
remove chapter3 files
add all files
add all files
chapter5
add to masters
add modified conflicts