landing page with 3 images
resolved conflicts