built crappy first landing page
resolved conflict