diff --git a/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php b/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php
index 025dabc..9fde429 100644
--- a/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php
+++ b/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php
@@ -21,28 +21,16 @@ class AddOnepercentToTebusTable extends Migration
     public function getActiveDB()
     {
         $config_db = array_keys(config("database.connections"));
-<<<<<<< Updated upstream
 
         $db_connection = array_filter($config_db, function ($connection) {
             try {
-                if ($connection == 'mysql7') {
-=======
-                
-        $db_connection = array_filter($config_db,function($connection){
-            try{
                 if($connection == 'mysql7' || $connection == 'lelong')
->>>>>>> Stashed changes
                     return false;
-                }
 
                 $db = DB::connection($connection)->getPdo();
                 return true;
-<<<<<<< Updated upstream
             } catch (\Exception $e) {
-=======
-            } catch(\Exception $e){
                 Log::info($connection);
->>>>>>> Stashed changes
                 return false;
             }
         });