chapter-6 done
merge conflicts
7.2.1