diff --git a/storage/logs/laravel.log b/storage/logs/laravel.log
index c3b8853cb88cb9e328ffdaa90dbe45fb63b5dd22..fedfa81e64154209f52b18c7cbfc805be6a90967 100644
--- a/storage/logs/laravel.log
+++ b/storage/logs/laravel.log
@@ -9825,6 +9825,7 @@ Did you mean one of these?
 #45 /var/www/artisan(37): Illuminate\\Foundation\\Console\\Kernel->handle(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
 #46 {main}
 "} 
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 [2023-04-06 07:27:14] local.ERROR: SQLSTATE[HY000]: General error: 1005 Can't create table `mycamp_db`.`member` (errno: 184 "Tablespace already exists") (SQL: create table `Member` (`id` bigint unsigned not null auto_increment primary key, `mem_id_card` varchar(255) not null, `mem_prefix_th` varchar(255) not null, `mem_prefix_en` varchar(255) not null, `mem_fname_th` varchar(255) not null, `mem_fname_en` varchar(255) not null, `mem_lname_th` varchar(255) not null, `mem_lname_en` varchar(255) not null, `mem_birthday` date not null, `mem_lawyer_type` varchar(255) not null, `mem_license` varchar(255) not null, `mem_lawyer_affiliation` varchar(255) not null, `mem_lawyer_relation` varchar(255) not null, `mem_email` varchar(255) not null, `mem_phone_nember` varchar(10) not null, `mem_type` int not null default '0', `mem_status` int not null default '0', `mem_balance` int not null) default character set utf8mb4 collate 'utf8mb4_unicode_ci') {"exception":"[object] (Illuminate\\Database\\QueryException(code: HY000): SQLSTATE[HY000]: General error: 1005 Can't create table `mycamp_db`.`member` (errno: 184 \"Tablespace already exists\") (SQL: create table `Member` (`id` bigint unsigned not null auto_increment primary key, `mem_id_card` varchar(255) not null, `mem_prefix_th` varchar(255) not null, `mem_prefix_en` varchar(255) not null, `mem_fname_th` varchar(255) not null, `mem_fname_en` varchar(255) not null, `mem_lname_th` varchar(255) not null, `mem_lname_en` varchar(255) not null, `mem_birthday` date not null, `mem_lawyer_type` varchar(255) not null, `mem_license` varchar(255) not null, `mem_lawyer_affiliation` varchar(255) not null, `mem_lawyer_relation` varchar(255) not null, `mem_email` varchar(255) not null, `mem_phone_nember` varchar(10) not null, `mem_type` int not null default '0', `mem_status` int not null default '0', `mem_balance` int not null) default character set utf8mb4 collate 'utf8mb4_unicode_ci') at /var/www/vendor/laravel/framework/src/Illuminate/Database/Connection.php:760)
 [stacktrace]
@@ -10109,6 +10110,9 @@ Did you mean one of these?
 #61 {main}
 "} 
 [2023-04-06 04:55:36] local.ERROR: View [Register.v_register_page1] not found. {"exception":"[object] (InvalidArgumentException(code: 0): View [Register.v_register_page1] not found. at /var/www/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php:137)
+=======
+[2023-04-06 16:26:00] local.ERROR: View [Register.v_register_page1] not found. {"exception":"[object] (InvalidArgumentException(code: 0): View [Register.v_register_page1] not found. at /var/www/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php:137)
+>>>>>>> Stashed changes
 [stacktrace]
 #0 /var/www/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php(79): Illuminate\\View\\FileViewFinder->findInPaths('Register.v_regi...', Array)
 #1 /var/www/vendor/laravel/framework/src/Illuminate/View/Factory.php(138): Illuminate\\View\\FileViewFinder->find('Register.v_regi...')
@@ -10160,6 +10164,7 @@ Did you mean one of these?
 #47 /var/www/public/index.php(52): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request))
 #48 {main}
 "} 
+<<<<<<< Updated upstream
 [2023-04-06 05:52:14] local.ERROR: View [Admin.Register.v_register_page1] not found. {"exception":"[object] (InvalidArgumentException(code: 0): View [Admin.Register.v_register_page1] not found. at /var/www/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php:137)
 [stacktrace]
 #0 /var/www/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php(79): Illuminate\\View\\FileViewFinder->findInPaths('Admin.Register....', Array)
@@ -12215,3 +12220,5 @@ Did you mean one of these?
 #60 /var/www/public/index.php(52): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request))
 #61 {main}
 "} 
+=======
+>>>>>>> Stashed changes