Lecture 8 is here
Fix conflict