modified home page
merged conflicts