merged fixed with reveal.js