fixed merge issues
finished exercises in Chap 6