Resolved conflicts

resources/views/app/hcp/order-products/forms/place-order.blade.php

@@ -1,9 +1,5 @@
 <div class="bg-light border p-4 mb-4" id="formComponent">
-<<<<<<< HEAD:resources/views/app/physicians/order-products/forms/place-order.blade.php
-    <form class="" action="{{ route('physicians.submit-order-ligators') }}" method="post" autocomplete="off" id="order-form">
-=======
     <form class="" action="{{ route('hcp.submit-order-ligators') }}" method="post" autocomplete="off">
->>>>>>> 3d53296fc7a68d701f16659fd567d9ef7d35855a:resources/views/app/hcp/order-products/forms/place-order.blade.php
         @csrf
         <div class="row">
             <div class="col-12">

resources/views/app/hcp/order-products/samples.blade.php

@@ -40,11 +40,7 @@
         </div>
       </div>
       <div class="bg-light border p-4 mb-4" id="formComponent">
-<<<<<<< HEAD:resources/views/app/physicians/order-products/samples.blade.php
-          <form class="" id="sample-request-form" action="{{ route('physicians.submit-request-samples') }}" method="post" autocomplete="off">
-=======
           <form class="" action="{{ route('hcp.submit-request-samples') }}" method="post" autocomplete="off">
->>>>>>> 3d53296fc7a68d701f16659fd567d9ef7d35855a:resources/views/app/hcp/order-products/samples.blade.php
               @csrf
               <div class="row">
                   <div class="col-12">