I completed the exercises for lecture 17.
I corrected the merge conflict.