resolving merge conflicts introduced by merging gh-pages branch