changing landing page image
fixing merge conflicts