diff --git a/content/master.blade.php b/content/master.blade.php
index 5104b9e..c731afc 100644
--- a/content/master.blade.php
+++ b/content/master.blade.php
@@ -171,16 +171,12 @@
                 updateProductsInLocalStorage();
             });
             $(document).on('change', '.select-quantity', function(){
-<<<<<<< HEAD
                 let quantity = $(this).val();
                 let productId = $(this).attr('data-id');
                 let objProductInfo = objProducts.find(obj => obj.id == productId);
                 let index = objProducts.indexOf(objProductInfo);
                 objProducts[index].quantity = quantity;
                 updateProductsInLocalStorage();
-=======
-
->>>>>>> refs/remotes/origin/master
             });
         });
     </script>
diff --git a/content/pages/checkout.blade.php b/content/pages/checkout.blade.php
index 9a0f089..b6b36ff 100644
--- a/content/pages/checkout.blade.php
+++ b/content/pages/checkout.blade.php
@@ -23,7 +23,6 @@
                             Persönliche Daten
                         </h5>
                     </div>
-<<<<<<< HEAD
                     <div class="card-body">
                         <x-form id-name="anfrage" channels="bestaetigung,airtable">
                             <div class="mb-3">
@@ -65,10 +64,7 @@
 
                             </div>
                         </x-form>
-=======
                     <div class="col-12 col-md-7">
-
-
                         <div class="card mt-1 mb-5 shadow-lg" style="background-color: #f7fcf7;">
                             <div class="card-header" style="background-color: #546c8a; color: white;">
                                 <h5> <svg style="fill:currentColor; width: 22px; margin-right: 5px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm128 421.6c-35.9 26.5-80.1 42.4-128 42.4s-92.1-15.9-128-42.4V416c0-35.3 28.7-64 64-64 11.1 0 27.5 11.4 64 11.4 36.6 0 52.8-11.4 64-11.4 35.3 0 64 28.7 64 64v13.6zm30.6-27.5c-6.8-46.4-46.3-82.1-94.6-82.1-20.5 0-30.4 11.4-64 11.4S204.6 320 184 320c-48.3 0-87.8 35.7-94.6 82.1C53.9 363.6 32 312.4 32 256c0-119.1 96.9-216 216-216s216 96.9 216 216c0 56.4-21.9 107.6-57.4 146.1zM248 120c-48.6 0-88 39.4-88 88s39.4 88 88 88 88-39.4 88-88-39.4-88-88-88zm0 144c-30.9 0-56-25.1-56-56s25.1-56 56-56 56 25.1 56 56-25.1 56-56 56z"/></svg>
@@ -188,7 +184,6 @@
 
                             </div>
                         </div>
->>>>>>> refs/remotes/origin/master
                     </div>
                 </div>
             </div>
@@ -248,11 +243,6 @@
             </tr>`);
         });
     });
-
-    $('.btn-remove-product').click(function(){
-        // let index = objProducts.indexOf(value);
-        // if(index != -1) objProducts.splice(index, 1);
-    });
   });
 </script>
 @stop