Updated the homepage.
Fixed merge conflict.