resolved merge conflicts with gh-pages branch