diff --git a/website_sale_order_validity/__manifest__.py b/website_sale_order_validity/__manifest__.py
index 9b6b9615..40d7c3de 100644
--- a/website_sale_order_validity/__manifest__.py
+++ b/website_sale_order_validity/__manifest__.py
@@ -20,7 +20,13 @@
 {
     "name": "Website Sale Order Validity",
     "category": "Hidden",
+<<<<<<< 34e8a2bb381834ffacc21da3e1057b622fb6bc45
     "version": "19.0.1.0.0",
+||||||| e7e58b710377ce866e106cceedba707e9b207673
+    "version": "18.0.1.0.0",
+=======
+    "version": "18.0.1.1.0",
+>>>>>>> 6c3aeefddb696eeef3faf9942a310037f8176aec
     "author": "ADHOC SA",
     "website": "www.adhoc.com.ar",
     "license": "AGPL-3",
diff --git a/website_sale_order_validity/views/templates.xml b/website_sale_order_validity/views/templates.xml
index 943999dd..47e0e399 100644
--- a/website_sale_order_validity/views/templates.xml
+++ b/website_sale_order_validity/views/templates.xml
@@ -14,9 +14,19 @@
             </div>
         </xpath>
     </template>
+<<<<<<< 34e8a2bb381834ffacc21da3e1057b622fb6bc45
     <template id="navigation_buttons" name="Navigation buttons" inherit_id="website_sale.navigation_buttons">
         <xpath expr="//t[@t-if='website_sale_order and website_sale_order.website_order_line']/.." position="attributes">
             <attribute name="t-if">website_sale_order.validity_date and website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
+||||||| e7e58b710377ce866e106cceedba707e9b207673
+    <template name="Checkout layout page" id="checkout_layout" inherit_id="website_sale.checkout_layout">
+        <xpath expr="//div[@t-if='website_sale_order and website_sale_order.website_order_line']//div//t[@t-call='website_sale.navigation_buttons']" position="attributes">
+            <attribute name="t-if">website_sale_order.validity_date and website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
+=======
+    <template name="Checkout layout page" id="checkout_layout" inherit_id="website_sale.checkout_layout">
+        <xpath expr="//div[@t-if='website_sale_order and website_sale_order.website_order_line']//div//t[@t-call='website_sale.navigation_buttons']" position="attributes">
+            <attribute name="t-if">not website_sale_order.validity_date or website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
+>>>>>>> 6c3aeefddb696eeef3faf9942a310037f8176aec
         </xpath>
         <xpath expr="//t[@t-if='website_sale_order and website_sale_order.website_order_line']/.." position="after">
             <div t-if="website_sale_order.validity_date and website_sale_order.validity_date &lt; datetime.datetime.now().date()" class="alert alert-warning text-center mt-3" role="alert">