week 8 notebooks
Week 8, conflicts fixed for old notebook base