design landing page
resolved conflict
resolved conflict