design for home page
merged conflicts