changed content text to home page
conflict from pull merged