homepage
fixing merge conflict