diff --git a/config/database.php b/config/database.php
index cc1803f..ece90e4 100644
--- a/config/database.php
+++ b/config/database.php
@@ -2,15 +2,7 @@
 
 return [
 
-<<<<<<< HEAD
    'default' => 'mysql7',
-=======
-<<<<<<< HEAD
-   'default' => 'mysql',
-=======
-   'default' => 'mysql7',
->>>>>>> 083caf7 (Add new columns to komuditi_transaksi)
->>>>>>> 01bba68 (Add new columns to komuditi_transaksi)
    'migrations' => 'migrations',
    'connections' => [
         'lelong' => [