about to merge ch7 conflict
merged ch7.txt
...