merged htdocs