updates homepage
fixes merge conflicts