merge errors with master and gh-pages for display.js