Fix merge conflict

Author: jissereitsma

view/frontend/templates/component/messages.phtml

@@ -1,11 +1,5 @@
 <?php declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-
-use Loki\Components\Factory\ViewModelFactory;
-=======
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
 use Loki\CssUtils\Util\CssClass;

view/frontend/templates/script/alpine-csp.phtml

@@ -1,13 +1,8 @@
 <?php declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
-/** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
-
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 
 $jsUrl = $block->getViewFileUrl('Loki_Base::js/alpine-csp.js');

view/frontend/templates/script/component/message-component.phtml

@@ -1,14 +1,9 @@
 <?php
 declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
-/** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
-
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 
 $timeout = (int)$block->getTimeout(); // @todo Right source for this?

view/frontend/templates/script/cookies.phtml

@@ -4,11 +4,7 @@ declare(strict_types=1);
 use Loki\Base\ViewModel\CookieConfig;
 use Magento\Framework\View\Element\Template;
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
 /** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
 /** @var Template $block */
 /** @var CookieConfig $cookieConfig */
 

view/frontend/templates/script/directive/autoremove-directive.phtml

@@ -1,14 +1,9 @@
 <?php
 declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
-/** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
-
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 ?>
 <script>

view/frontend/templates/script/store/localstorage-store.phtml

@@ -1,16 +1,10 @@
 <?php
 declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
-/** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
-
-
 use Loki\Base\ViewModel\SectionConfig;
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 /** @var SectionConfig $sectionConfig */
 

view/frontend/templates/script/store/message-store.phtml

@@ -1,14 +1,9 @@
 <?php
 declare(strict_types=1);
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
-/** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
-
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 ?>
 <script>

view/frontend/templates/script/variables.phtml

@@ -4,11 +4,7 @@ declare(strict_types=1);
 use Loki\Base\ViewModel\FormKeyValue;
 use Magento\Framework\View\Element\Template;
 
-<<<<<<< HEAD
-/** @version 1.0.1 */
-=======
 /** @version 1.0.3 */
->>>>>>> 73f1dcc3384275fd2db876c8646551d8c4617293
 /** @var Template $block */
 /** @var FormKeyValue $formKeyValue */