mergers from gh-pages