chapter-6 done
fixed conflicts