diff --git a/routes/report.php b/routes/report.php
index 5fab083..67353ed 100644
--- a/routes/report.php
+++ b/routes/report.php
@@ -1,25 +1,17 @@
 <?php
 
-<<<<<<< HEAD
-$router->group(['prefix'=>'api/reports'], function () use ($router){
-    $router->group(['namespace' => 'Reports'], function() use($router){
-=======
 $router->group(['prefix' => 'api/reports'], function () use ($router) {
     $router->group(['namespace' => 'Reports'], function () use ($router) {
->>>>>>> 3ced9b3 (Add report ringkasan harian)
         $router->get('gadaian', ['uses' => 'GadaianController@getSummaryLaporanGadai']);
         $router->get('gadaian/{kod_cawangan}', ['uses' => 'GadaianController@getLaporanCawangan']);
         $router->get('penebusan', ['uses' => 'PenebusanController@getSummaryLaporanTebus']);
         $router->get('penebusan/{kod_cawangan}', ['uses' => 'PenebusanController@getLaporanCawangan']);
         $router->get('ansuran', ['uses' => 'AnsuranController@getSummaryLaporanAnsuran']);
         $router->get('ansuran/{kod_cawangan}', ['uses' => 'AnsuranController@getLaporanCawangan']);
-<<<<<<< HEAD
-=======
         $router->get('kawalan-stok/{kod_cawangan}', ['uses' => 'KawalanStokController@getLaporanCawangan']);
         $router->get('ringkasan-harian', ['uses' => 'RingkasanHarianController@getSummaryLaporanRingkasanHarian']);
         $router->get('ringkasan-harian/{kod_cawangan}', ['uses' => 'RingkasanHarianController@getLaporanCawangan']);
 
->>>>>>> 3ced9b3 (Add report ringkasan harian)
         $router->get('onepercent/balance/{kod_cawangan}', ['uses' => 'OnePercentController@getKeuntunganImbangDuga']);
         $router->get('onepercent/ledger/{kod_cawangan}', ['uses' => 'OnePercentController@getKeuntunganLejerAm']);
         $router->get('ujrah/balance/{kod_cawangan}', ['uses' => 'OnePercentController@getUjrahImbangDuga']);