diff --git a/config/database.php b/config/database.php
index 55c61c7c..7ee80bab 100644
--- a/config/database.php
+++ b/config/database.php
@@ -65,7 +65,7 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 
diff --git a/env-example b/env-example
index 16c56f45..c7d77f12 100644
--- a/env-example
+++ b/env-example
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 APP_NAME=IZYIM
 APP_ENV=local
 APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
@@ -38,7 +37,6 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-=======
 APP_NAME=exchange
 APP_ENV=local
 APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
@@ -78,4 +76,3 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
->>>>>>> 06aa931eb57dbc7c95748ade6e3bb659f0659abe
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 682bbb2c..cd5edf80 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
+class ComposerStaticInitcf93d959a701f2cce72413258326eb20
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -4321,10 +4321,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$classMap;
 
         }, null, ClassLoader::class);
     }