Update homepage
Fix merge