Update front page
Resolve merge conflicts
Resolve merge conflict