changed home page
merged conflicts on home page