Resolve conflicts.
Initial commit of lesson 4.