updated home page
resolve merge conflicts