Merge conflict not resolved, but commit

[jhavmoeller]

In the demo index.html there's a unresolved merge conflict commited.

<<<<<<< HEAD
<script src="../node_modules/novicell-debounce/js/novicell.debounce.js"></script>
<script src="../js/novicell.dynamic-image.js"></script>
<script>
window.lazySizesConfig = {
useWebp: true
}
</script>
<script src="../js/lazy-images.js"></script>
<script src="../node_modules/lazysizes/lazysizes.min.js"></script>

<script src="../dist/demo.umd.js"></script>

feature/modular-rework

[Dan9boi]

seems to be resolved now.