fixed merged errors from gh-pages branch