Resolved conflicts between branch master and gh-pages