resolved a merge conflict with gh-pages earlier.