re-add posts to homepage
resolve merge conflict