fixed reveal.js
fixed merge errors