geting start page
fixing conflixts