Added content and images for diff merge lesson