fixing home page
merged conflict