resolved conflict

routes/web.php

@@ -94,11 +94,8 @@ Route::middleware('pro.auth')->group(function () {
             Route::get('claims', 'PracticeManagementController@claims')->name('claims');
             Route::get('claims-download', 'PracticeManagementController@downloadClaims')->name('download-claims');
 
-<<<<<<< HEAD
-=======
             Route::get('treatment-service-util', 'PracticeManagementController@treatmentServiceUtil')->name('treatmentServiceUtil');
 
->>>>>>> ae6aa8a9b12939e98ef8c66d20a43bdda7277d99
         });
     });