Enable the demo to work with the CSS Regions polyfill
Fix conflics for merging #1