diff --git a/config/database.php b/config/database.php
index f00cfca..f464311 100644
--- a/config/database.php
+++ b/config/database.php
@@ -17,7 +17,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-<<<<<<< Updated upstream
         'mysql37' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_37'),
@@ -30,8 +29,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
          ],
-=======
->>>>>>> Stashed changes
         'mysql2' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_2'),
@@ -428,23 +425,7 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-<<<<<<< Updated upstream
 	    'mysql34' => [
-=======
-        'mysql36' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_36'),
-            'port'      => env('DB_PORT_36'),
-            'database'  => env('DB_DATABASE_36'),
-            'username'  => env('DB_USERNAME_36'),
-            'password'  => env('DB_PASSWORD_36'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-       'mysql34' => [
->>>>>>> Stashed changes
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_34'),
             'port'      => env('DB_PORT_34'),
@@ -456,11 +437,7 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-<<<<<<< Updated upstream
 	    'mysql35' => [
-=======
-        'mysql35' => [
->>>>>>> Stashed changes
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_35'),
             'port'      => env('DB_PORT_35'),
@@ -471,7 +448,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-<<<<<<< Updated upstream
          ],
         'mysql36' => [
             'driver'    => 'mysql',
@@ -496,8 +472,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-=======
->>>>>>> Stashed changes
         ],
     ],
 ];