Fixed some git merge errors in lecture 1