aded a merge directive for the gh-pages branch