updated home page and fixed merge conflict