change the title of home page
resolve the conflict when merge two branch